repo.or.cz
/
EMFCompare2.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Index issue when merging non-unique attributes' elements
2019-09-06
lgou
b
et
Index
i
ssue when
m
erging non-uniqu
e
att
r
ibutes' el
e
ments
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Diffs depend
i
ng on
pseudo-conf
l
icts
d
o not reje
c
t t
h
e
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
MOVE differen
c
e
s also need to take into account the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
In
a
ccur
a
te conflict detecti
o
n for mov
e
s in non-
c
ontainment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoube
t
M
oves with no
n
-
u
n
ique values and addition/deletio
n
s
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Only MOVE diffs need to
be ignore
d
wh
e
n compu
t
ing the LCS
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Co
n
flict
d
etecti
o
n on
index changes
m
u
s
t take
F
eatureF
i
lter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoube
t
Make sure the UI won't
try to
compute the
L
CS fo
r
huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
The "accept/reject" al
l
non-c
o
nflicting action
sh
o
uld
n
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoub
e
t
F
ix diff,
c
onflict detection and
merging of n
o
n-uni
q
ue
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgou
b
et
Potential out of bounds ex
c
eption
commit
|
commitdiff
|
tree
2019-08-27
lgoubet
Co
m
p
atibility with jgit
5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoube
t
Perfo
r
manc
e
-
u
s
e DiffCros
s
Reference
r
when possibl
e
commit
|
commitdiff
|
tree
2019-08-22
lgoub
e
t
regre
s
sion - r
i
g
h
t-clic
k
actions on single diff
s
e
l
ections
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgo
u
bet
Open SMV API to allow implementers t
o
access the
r
aw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Pr
e
vent
s
exce
p
tions from b
e
ing
t
h
rown from the viewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
l
g
o
ubet
Performance
-
u
se
stream
s
instead
o
f guava iter
a
t
ions
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
l
goubet
Performance - re
m
ove useless guava
t
ransforma
t
ion
commit
|
commitdiff
|
tree
2019-07-17
Chr
i
stian W
.
Damus
[
5
220
8
0] [UML] Add-add c
o
nfli
c
ts in st
e
r
e
o
t
ype application
.
.
.
commit
|
commitdiff
|
tree
2019-07-17
lgoubet
Fix d
e
t
e
ction of
pseudo confli
c
ts on single-
v
a
lued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Re
g
ression on the group/match right-click actions in SMW
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Properly describe what the con
f
lict resolv
i
ng actions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Mar
t
in Fleck
[506928] Comp
a
risonScopeEditorIn
p
ut
d
oes not r
e
spect
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
S
te
f
an Dirix
Cancel
Faste
r
in
P
roximityEObjectMatcher
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Add Struc
t
ure
M
ergeViewer cus
t
omi
z
at
i
on
o
ptions
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Shortc
u
t the UMLPostProcesso
r
's subset implication
s
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Axel Richard
Activ
a
tion of al
l
Git tes
t
s
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Pr
e
vent NPE
f
rom over
r
id
e
n Resource
i
mplement
a
tions
commit
|
commitdiff
|
tree
2019-07-16
l
goubet
Ig
n
ore "origin
a
lTargetObj
e
cts" from the EMF Compare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
l
g
oubet
B
ump ve
r
sions to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
William Pier
s
Enable
d
"accept
c
hange"
action on
multiple diff s
e
le
c
tion
commit
|
commitdiff
|
tree
2019-07-04
lgo
u
bet
Adapt
te
s
ts to
E
Git chang
e
of behavior
commit
|
commitdiff
|
tree
2019-05-29
lgoubet
En
a
ble
u
s
e
rs to merge
all
c
onflict
s
a
t
onc
e
through
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Mergin
g
single-valued conta
i
nment changes can lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Typos
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Prevent
LC
S
com
p
utation w
h
en we do not need orde
r
ing
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lg
o
ube
t
Pre
v
ent dup
l
icate insertion points
t
o be shown in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgoubet
Preven
t
CMV disposal when user se
l
ects mu
l
t
i
p
l
e
eleme
n
ts
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgoubet
Only add new ad
a
pt
e
rs when needed
commit
|
commitdiff
|
tree
2019-04-14
lg
o
ub
e
t
Iterate
o
ver th
e
d
i
fferences instead of the m
a
t
c
h
es
commit
|
commitdiff
|
tree
2019-04-09
lgo
u
bet
Prevent O
u
tOfMemo
r
y
Errors from th
e
UI when switching CMV
commit
|
commitdiff
|
tree
2019-04-08
lgoub
e
t
Performance - Computing require
m
e
n
t
s t
i
mes
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
The
UML tests shou
l
dn't u
s
e
a
c
a
c
h
ed
instance
o
f EMFC
o
mpare
commit
|
commitdiff
|
tree
2019-04-03
lg
o
ube
t
Restore possibili
t
y to
re
m
o
v
e
mergers from th
e
registry
commit
|
commitdiff
|
tree
2019-04-01
W
i
lliam Piers
F
i
xed
A
rrayOutOfBoun
d
s in case of empty list
s
commit
|
commitdiff
|
tree
2019-03-22
l
goubet
Make
sure we
hook the UI when users provide a precomp
u
ted
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgou
b
et
B
u
m
p EMF
C
o
mpare to 3
.
3
.
7 in pr
e
p
a
ration for
2
0
1
9-06
commit
|
commitdiff
|
tree
2019-03-21
l
g
oubet
Disposing
o
f
t
h
e compa
r
ison
s
ho
u
ldn'
t
be don
e
b
y
th
e
SMV
commit
|
commitdiff
|
tree
2019-03-04
lgoub
e
t
Avoi
d
ClassCastException w
h
en mergin
g
feature map changes
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Bump vers
i
ons for
3
.
3
.
6 for 2019
-
03
commit
|
commitdiff
|
tree
2019-02-26
lgo
u
bet
patch ModelGitMe
r
geE
d
itorInput f
o
r EGit 5
.
3
.
0
c
ompatib
i
lity
commit
|
commitdiff
|
tree
2019-02-26
l
goubet
Su
p
p
ress gua
v
a n
e
sted c
o
ncatenations
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Remove a
c
cid
e
ntal use of G
u
a
v
a
commit
|
commitdiff
|
tree
2019-02-11
l
goub
e
t
SWTException wh
e
n switching
c
omparison
s
in
a
compa
r
e
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Allow cl
i
ents to provide pre-computed comparisons to
.
.
.
commit
|
commitdiff
|
tree
2018-12-11
Phil
i
p Langer
[527567] P
r
ovide
s
uppo
r
t for a gene
r
a
l property merge
.
.
.
commit
|
commitdiff
|
tree
2018-12-11
Philip Langer
[5
1
4
079]
Impr
o
ve mirroring suppor
t
commit
|
commitdiff
|
tree
2018-12-04
lgoub
e
t
Ignore
f
a
i
ling gi
t
test
s
for now
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Bump versions t
o
3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgou
b
e
t
Use a
r
eleased vers
i
on of
Sirius
commit
|
commitdiff
|
tree
2018-11-30
lgoubet
[5
4
1730]
Rever
t
s d59c9
2
4
d
u
e to an UI f
r
eeze
commit
|
commitdiff
|
tree
2018-06-22
l
g
o
u
bet
bump
f
eatur
e
v
ersions
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bump vers
i
o
n
s
commit
|
commitdiff
|
tree
2018-06-22
S
tép
h
a
ne T
h
ib
a
udeau
Ex
t
ension point to
p
rovide specific matching rules
.
.
.
commit
|
commitdiff
|
tree
2018-06-22
Stéphane Thibaudeau
Remove usel
e
ss and
myster
i
o
u
s code
commit
|
commitdiff
|
tree
2018-06-22
Stép
h
ane
Thibau
d
e
au
EMF C
o
m
pare is compati
b
le with JGit 5
.
* versions
commit
|
commitdiff
|
tree
2018-06-22
Stéphan
e
Thi
b
a
u
deau
Add ex
p
licit
depende
n
cy to org
.
eclipse
.
g
ef
commit
|
commitdiff
|
tree
2018-06-22
Stép
h
an
e
Thibau
d
e
a
u
Do not
minimize identical resources when
Xtext is used
commit
|
commitdiff
|
tree
2018-06-22
Stéphane
Thib
a
udeau
Use
w
hite-list s
t
ra
t
egy to retriev
e
th
e
M
odel provider
commit
|
commitdiff
|
tree
2018-06-22
Stép
h
ane Thibaudeau
Better hand
l
ing
of Xtext with Live scope option
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
EMF Compare is no longe
r
compatib
l
e with
e
gi
t
< 4
.
2
commit
|
commitdiff
|
tree
2018-06-05
lgoubet
I
n
tro
d
uc
e
test for merges w
i
th m
u
lt
i
ple ances
t
ors
commit
|
commitdiff
|
tree
2018-06-04
Arthu
r
Daussy
[5
3
4365]
F
i
x
Recursi
v
eModel
M
erger for "binary" git
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
Ar
t
h
u
r
Da
u
s
sy
D
o not handle "merged"
f
i
l
es t
w
ice when JGit sta
g
es
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
Arthur
D
aussy
[535200]
C
reate a new TreeWal
k
ins
t
ead reusing one
commit
|
commitdiff
|
tree
2018-05-03
Ph
i
l
ip Langer
Improve performa
n
ce of D
i
ffUti
l
commit
|
commitdiff
|
tree
2018-05-03
Philip Langer
Improve performance of C
o
mp
a
risionUti
l
commit
|
commitdiff
|
tree
2018-05-03
Philip Langer
Improv
e
performance of eq
u
ality
helpe
r
commit
|
commitdiff
|
tree
2018-05-01
C
hris
t
ian
W
.
Damus
[525473] [Papyrus
]
Connections disa
p
pear whe
n
co
m
p
ari
n
g
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
Avoid visiting elements multiple times in Grap
h
.
P
arentsI
t
erato
r
commit
|
commitdiff
|
tree
2018-05-01
Christian W
.
D
amu
s
[525286] [Papyrus] Diffs in invisib
l
e
stereo
t
ype property
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Ph
i
li
p
L
a
n
ger
[521940] Preven
t
index out of bo
u
n
d
s ex
c
eption
on
e
mpty
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip
Langer
S
WTU
t
il
.
safeRe
d
raw should ch
e
c
k for dis
p
ose
d
control
commit
|
commitdiff
|
tree
2018-05-01
Philip L
a
nger
[527567] Ge
n
eralize the t
a
b
l
e a
n
d t
r
ee merge viewer
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
C
amille Letavernier
[529882]
S
ynchronize zoom
l
e
v
el
s
and allow changing
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Phil
i
p Langer
Im
p
rove performa
n
ce
of the
m
erging proces
s
commit
|
commitdiff
|
tree
2018-05-01
P
h
ilip Langer
I
m
p
r
o
v
e
p
e
rformance of I
D
iffRelationshipComputer im
p
lementat
i
ons
commit
|
commitdiff
|
tree
2018-05-01
Philip Lan
g
er
Impr
o
ve
perfor
m
a
nce
o
f A
b
s
tractCopyCommand
.
getChangedDiffs
commit
|
commitdiff
|
tree
2018-05-01
P
hili
p
Langer
[52786
4
]
Prevent CMV lines to be bro
k
en after merging
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
[527
8
58
]
Select
i
ng a diff with conf
l
ict
s
f
a
ils
commit
|
commitdiff
|
tree
2018-05-01
P
h
ilip Langer
[527567] D
i
agramCompareItemProvide
r
AdapterFactory should
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
P
h
i
lip Langer
[
5
08526] Imp
r
ov
e
te
x
t compare
commit
|
commitdiff
|
tree
2018-05-01
Philip Lan
g
e
r
T
h
e show merge conse
q
uences co
n
tr
o
l is confusing
w
he
n
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
EMFCompareS
t
ructureMergeViewer d
o
e
s
mu
c
h redundant
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Phi
l
ip Langer
Support key bin
d
in
g
s
for commonly
used m
e
rge/nav
i
gate
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Phil
i
p Langer
Improve M
a
n
y
S
t
ruc
t
ura
l
FeatureAccessorImpl
.
getDiffWithValue
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
I
m
p
r
ov
e
I
Merger r
e
g
istr
y
impl
e
menta
t
ion
commit
|
commitdiff
|
tree
2018-05-01
Phi
l
ip L
a
nger
Impro
v
e perf
o
r
mance of textual va
l
ue mat
c
hing
commit
|
commitdiff
|
tree
2018-04-30
Philip Langer
I
mpr
o
ve perf
o
r
m
ance of
Co
m
p
a
risonSpec
commit
|
commitdiff
|
tree
2018-04-30
Philip Langer
Avoid expensive notificatio
n
s
processing after compare
.
.
.
commit
|
commitdiff
|
tree
next