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
lg
o
ubet
In
d
ex issue wh
e
n merging
non-unique a
t
tributes' el
e
men
t
s
commit
|
commitdiff
|
tree
2019-09-06
lgo
u
b
et
Diffs depend
i
ng on ps
e
udo-confl
i
cts do not reject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgo
u
bet
MOVE dif
f
ere
n
ces also need t
o
take
i
n
to account the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
l
g
o
ubet
Inaccurat
e
conflict detecti
o
n
for moves in n
o
n
-cont
a
in
m
e
n
t
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoub
e
t
M
o
v
e
s wit
h
n
o
n
-
unique values and addi
t
ion/deletion
s
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
l
goubet
Only MO
V
E diffs need
t
o be
i
gnored wh
e
n compu
t
i
n
g the LCS
commit
|
commitdiff
|
tree
2019-09-04
lgoube
t
Confli
c
t detec
t
ion on index cha
n
ges mus
t
take Fe
a
ture
F
i
l
t
er
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
l
goubet
M
a
k
e
sure t
h
e U
I
won't try
t
o
compute
the LCS for h
u
ge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
l
gou
b
et
The "accept/reject" all non-conf
l
ict
i
ng action sh
o
uldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoub
e
t
F
ix diff, conflict
detect
i
on and m
e
rging of non-unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoub
e
t
Potent
i
al out
of
bounds exception
commit
|
commitdiff
|
tree
2019-08-27
lgoubet
C
ompatibility with j
g
i
t 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
Performan
c
e -
use Dif
f
Cross
R
eferencer w
h
e
n possible
commit
|
commitdiff
|
tree
2019-08-22
lg
o
ubet
re
g
re
s
s
i
on - r
i
g
ht-click acti
o
ns on s
i
n
g
le diff
se
l
ections
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
O
p
en
S
MV API to allow implementers
t
o access the raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
l
goubet
Prevents exc
e
ptions from being
t
hrown f
r
om
t
he vie
w
er
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
l
goubet
P
erformance - us
e
st
r
eams inste
a
d o
f
guava it
e
r
a
tions
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgo
u
b
e
t
Perf
o
rmance - re
m
ove useless guava
t
ransfor
m
atio
n
commit
|
commitdiff
|
tree
2019-07-17
Christian
W
.
Damus
[522080] [UML] Add-
a
dd con
f
lict
s
in st
e
reotype app
l
icati
o
n
.
.
.
commit
|
commitdiff
|
tree
2019-07-17
l
goube
t
Fi
x
detection of pse
u
do conflicts on sin
g
le-valued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Re
g
ression on the gro
u
p
/
match r
i
ght-
c
lick actio
n
s
in S
M
W
commit
|
commitdiff
|
tree
2019-07-16
lgoube
t
P
r
operl
y
describe what the conf
l
ict resolvi
n
g actions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Martin Fleck
[506928] ComparisonScopeEditorIn
p
ut does not respect
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
g
o
ubet
Add Structur
e
MergeViewer
custom
i
zat
i
on optio
n
s
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
Shortcu
t
the UMLP
o
s
tProcess
o
r's s
u
bse
t
implications
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
A
x
el Richard
A
ctivation
o
f
all Git tests
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Prevent NPE from overriden Re
s
ource implementations
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Ignore "orig
i
n
a
lTargetObjects
"
from the EMF Compare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgoube
t
Bump
v
ersi
o
ns to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgoub
e
t
Adapt tes
t
s to EGit chang
e
of behav
i
o
r
commit
|
commitdiff
|
tree
2019-05-29
lgoubet
Enab
l
e
users to merge all conflicts at once through
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lg
o
u
b
et
M
e
rging sin
g
le-valu
e
d
cont
a
inment change
s
c
a
n
l
e
ad
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
T
ypos
commit
|
commitdiff
|
tree
2019-05-23
l
goubet
Prevent LCS computation when we
do not need or
d
e
r
ing
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgoube
t
Prevent duplicat
e
inser
t
io
n
po
i
nts to be shown in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
l
goub
e
t
P
r
even
t
C
M
V di
s
posal wh
e
n u
s
er selects mult
i
ple e
l
ements
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
l
g
oubet
Only add ne
w
adapters when
n
eeded
commit
|
commitdiff
|
tree
2019-04-14
lgoubet
Iterate
o
ve
r
th
e
diff
e
rences instea
d
of the m
a
tches
commit
|
commitdiff
|
tree
2019-04-09
lgoubet
Prevent
Out
O
fM
e
moryErrors from
t
h
e UI
w
hen switch
i
ng CMV
commit
|
commitdiff
|
tree
2019-04-08
l
g
oubet
Perform
a
nce - Computing
r
e
quirements times
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
The UML
t
ests
shouldn
'
t u
s
e a cached
instance of EMFCompare
commit
|
commitdiff
|
tree
2019-04-03
lgoubet
Restore poss
i
bility to remove me
r
gers from the registry
commit
|
commitdiff
|
tree
2019-03-22
lgoubet
Make sure we hook the UI when users pr
o
v
i
de a pr
e
co
m
p
uted
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Bump EMF Co
m
pare
t
o 3
.
3
.
7 i
n
pr
e
paration for 20
1
9-06
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Dispos
i
ng
o
f
t
he comparison shouldn't
b
e done b
y
the SMV
commit
|
commitdiff
|
tree
2019-02-26
l
g
oubet
Bu
m
p versions
fo
r
3
.
3
.
6 fo
r
2019-03
commit
|
commitdiff
|
tree
2019-02-26
lgoub
e
t
pa
t
c
h
ModelGitMerge
E
d
itorInput for EGit
5
.
3
.
0 compatib
i
li
t
y
commit
|
commitdiff
|
tree
2019-02-26
lgo
u
bet
S
u
ppress g
u
ava nested concatenations
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Remove accid
e
nt
a
l use
of Guava
commit
|
commitdiff
|
tree
2019-02-11
l
go
u
bet
SW
T
Exception wh
e
n switchi
n
g comparisons in
a
c
ompare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Allow c
l
i
ents t
o
pr
o
vide p
r
e-com
p
u
ted comparisons to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
lgoubet
Ignore fai
l
ing git te
s
ts
f
or no
w
commit
|
commitdiff
|
tree
2018-12-03
l
g
ou
b
et
Bu
m
p versi
o
ns to 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Use a released version of Sirius
commit
|
commitdiff
|
tree
2018-11-30
lgoubet
[541730] Rev
e
rts d59c924
due
t
o an
U
I freeze
commit
|
commitdiff
|
tree
2018-06-22
lgo
u
b
e
t
bump feature ver
s
i
o
ns
commit
|
commitdiff
|
tree
2018-06-22
lgou
b
et
bu
m
p
v
ersions
commit
|
commitdiff
|
tree
2018-06-22
S
t
éphane Thi
b
au
d
eau
E
x
ten
s
i
o
n poi
n
t to provide spec
i
fic matching r
u
les
.
.
.
commit
|
commitdiff
|
tree
2018-06-22
S
té
p
hane Thiba
u
de
a
u
EMF Com
p
are is compat
i
ble with JG
i
t 5
.
*
v
e
r
sio
n
s
commit
|
commitdiff
|
tree
2018-06-22
Stéphane Thi
b
audea
u
A
d
d explicit d
e
p
e
n
dency to org
.
eclipse
.
gef
commit
|
commitdiff
|
tree
2018-06-22
Sté
p
hane Thibaud
e
au
Do not minimize i
d
e
n
tical resourc
e
s
when
X
t
e
xt is used
commit
|
commitdiff
|
tree
2018-06-22
Stéphane Thibaudeau
Us
e
white-list s
t
rateg
y
to
r
etrieve the Model provide
r
commit
|
commitdiff
|
tree
2018-06-22
Stéph
a
n
e
T
hibaudeau
Be
t
ter ha
n
dling
of
X
te
x
t wi
t
h
L
i
ve s
c
ope option
commit
|
commitdiff
|
tree
2018-06-22
lgoube
t
EMF Compare is
no longer comp
a
tible
w
it
h
egit
< 4
.
2
commit
|
commitdiff
|
tree
2018-06-05
lgoubet
Introduce test for merges wi
t
h multiple ancestors
commit
|
commitdiff
|
tree
2018-05-03
Philip L
a
nger
I
mprove perf
o
rmance of DiffUtil
commit
|
commitdiff
|
tree
2018-05-03
Philip
L
a
nger
I
mprove pe
r
formance
o
f ComparisionUtil
commit
|
commitdiff
|
tree
2018-05-03
Philip Langer
I
mprove per
f
orma
n
ce of e
q
ua
l
ity helper
commit
|
commitdiff
|
tree
2018-03-16
Laurent
G
oubet
Allow proxy
r
es
o
lu
t
ion from the E
M
F Compare content
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent
G
oubet
Allow prox
y
r
e
s
o
lution
from
the E
M
F Compare struc
t
u
re
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent Gou
b
et
SMV a
c
tion to reveal all diff
e
rences in
c
o
n
f
l
ict with
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent Goubet
Ad
d
actions to
m
erge everything
t
o
"
get right" o
r
.
.
.
commit
|
commitdiff
|
tree
2018-02-05
Christian W
.
Da
m
us
[522064]
Profi
l
e-ap
p
lication ver
s
ion c
h
ec
k
t
o
o restri
c
tive
.
.
.
commit
|
commitdiff
|
tree
2018-01-30
lgoube
t
Bump plu
g
in and feature
versions for Photon
commit
|
commitdiff
|
tree
2018-01-24
lgoubet
Rem
o
v
i
n
g
the Pa
p
yrus pl
u
g
i
ns and
f
ea
t
ures from
the
.
.
.
commit
|
commitdiff
|
tree
2013-01-18
lgoubet
[367475] Take git specific
i
ties int
o
accoun
t
when resolving
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
Renamin
g
ResourceT
r
a
v
ersal into Storag
e
Trav
e
r
s
al to
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
D
isp
l
ay a proper nam
e
for the refe
r
en
c
e
s
whe
n
the diff
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
lgoub
e
t
information
r
et
u
rne
d
i
f the logical mo
d
el resolut
i
on
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
Use the same ellision for Attribute an
d
reference labels
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
Prope
r
ly dis
p
lay dif
f
erence that are not directly refined
commit
|
commitdiff
|
tree
2012-10-22
l
g
ou
b
et
Pr
e
vent mer
g
ing tow
a
rds the git i
n
dex
(
o
r other remote
.
.
.
commit
|
commitdiff
|
tree
2012-10-22
l
g
oubet
Lower
t
h
e
n
umber of
threads : our bot
t
leneck is the
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
When res
t
ructuring t
h
e
m
atc
h
m
o
del
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
This has nothing to do
a
s package visible
commit
|
commitdiff
|
tree
2012-10-19
lg
o
u
bet
Make ResourceTraversa
l
,
R
esourceUtil and
S
tor
a
geURIConverter
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
L
o
ad the right versions
o
f the
d
ist
a
nt fi
l
es
.
commit
|
commitdiff
|
tree
2012-10-19
l
goubet
The
UI shoul
d
use post processors
commit
|
commitdiff
|
tree
2012-10-19
lgo
u
bet
avo
i
d double scheme
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lgo
u
bet
Always p
r
even
t
load : ecore tends to
l
oad new resourc
e
s
.
.
.
commit
|
commitdiff
|
tree
2012-10-15
lgoubet
L
eave the possibility
f
o
r sub-c
l
a
sse to not
h
a
v
e a
.
.
.
commit
|
commitdiff
|
tree
2012-10-15
lgou
b
et
Suppressi
n
g
un
a
vo
i
dable
war
n
ing
commit
|
commitdiff
|
tree
2012-10-15
l
goubet
Comme
n
ting, an
d
reducing
t
he nesting count of getDELO
r
iginVa
.
.
.
commit
|
commitdiff
|
tree
2012-10-15
lgoubet
Reducing nesting
commit
|
commitdiff
|
tree
2012-10-15
lgoube
t
Missing tags
commit
|
commitdiff
|
tree
2012-10-15
lgou
b
et
Comm
e
nting
commit
|
commitdiff
|
tree
2012-10-15
lgou
b
et
Unused fi
e
ld
commit
|
commitdiff
|
tree
2012-10-05
lgoubet
T
he res
o
lvin
g
call here
i
s
quit
e
costly
.
T
ry and only
.
.
.
commit
|
commitdiff
|
tree
2012-10-05
lgoubet
P
e
r
f
-
Avoid deep nesting of the concatenate
d
ope
r
ators
commit
|
commitdiff
|
tree
2012-10-05
lgoubet
Merging
C
edr
i
c's changes
commit
|
commitdiff
|
tree
next