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
Register the navigatable so that the toolbar actions work
2019-09-18
lgoubet
Regi
s
ter t
h
e navigatable so that the toolba
r
actions
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lgoubet
The nav
i
gatable's c
a
ch
e
needs
to b
e
clea
r
ed when w
e
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lgou
b
et
The
MatchEngi
n
eFact
o
ry doesn't m
a
ke
use of its setter
s
commit
|
commitdiff
|
tree
2019-09-16
lg
o
ube
t
Happy checkstyle
commit
|
commitdiff
|
tree
2019-09-11
lgoubet
Upda
t
e se
t
up file
commit
|
commitdiff
|
tree
2019-09-10
l
g
oubet
Tar
g
et p
l
atform ba
s
e
d
on
2
01
9
-06
commit
|
commitdiff
|
tree
2019-09-10
l
g
oubet
Behav
i
or
ch
a
n
ge in 2019-06 - Exceptio
n
s are no
w
i
n
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgoubet
Remove the
3
2
bit
p
latf
o
rms fo
r
o
u
r target configurati
o
ns
commit
|
commitdiff
|
tree
2019-09-06
l
goubet
Index issue when
m
e
r
gin
g
non-uni
q
u
e
at
t
r
i
bute
s
' el
e
ments
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Diffs depending on pse
u
do-
c
o
nfl
i
cts do n
o
t r
e
ject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoub
e
t
MOVE
d
i
fferences
also need to ta
k
e into account the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
I
n
a
c
c
u
rate conflict de
t
ection for moves in
n
on-conta
i
nment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
M
o
ves
with non-unique values and
a
ddition/dele
t
ions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Only MOVE diffs need to be ignored when computing
t
he LCS
commit
|
commitdiff
|
tree
2019-09-04
l
goubet
C
onflict
d
e
t
ectio
n
on in
d
ex cha
n
ges must tak
e
Feat
u
r
e
Filte
r
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Make
sure the UI won't
t
r
y to compute the LCS fo
r
huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
l
goubet
T
he "accept/reject
"
a
ll n
o
n-confli
c
t
i
ng a
c
tion sh
o
ul
d
n
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
Fix diff,
c
o
n
fli
c
t detectio
n
and mergin
g
o
f
non
-
unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lg
o
ubet
Pot
e
ntial out o
f
bounds excepti
o
n
commit
|
commitdiff
|
tree
2019-08-27
lgoube
t
Co
m
p
a
tib
i
lity wi
t
h j
g
it
5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
Performance - use
DiffCrossReferencer when
po
s
sible
commit
|
commitdiff
|
tree
2019-08-22
l
g
o
ubet
regression - right-click action
s
on single diff selecti
o
ns
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
l
goubet
O
pen SMV API to allow im
p
lementers to ac
c
ess the raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Prevents except
i
ons fr
o
m being th
r
o
w
n
fr
o
m
the
viewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
l
goubet
Pe
r
formanc
e
- use
s
treams i
n
st
e
ad
o
f guava iterations
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
Perf
o
rmance - remove useless guava t
r
a
nsfor
m
ation
commit
|
commitdiff
|
tree
2019-07-17
lg
o
ubet
Fix detection
o
f pseudo confli
c
ts on s
i
n
g
le-valued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoub
e
t
Regression on the group/m
a
tch rig
h
t-click
a
ction
s
in SM
W
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ub
e
t
Prop
e
rly de
s
cr
i
be wha
t
the
c
onflict resolving actions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Add StructureMerg
e
V
i
ewer
c
u
s
tomization options
commit
|
commitdiff
|
tree
2019-07-16
l
g
oubet
Shortcut
the UMLP
o
stProcesso
r
'
s
sub
s
et impl
i
cations
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgou
b
et
P
r
eve
n
t NPE
from overriden Resource implementati
o
ns
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Ig
n
ore "or
i
gi
n
al
T
arget
O
bjects" from
the EMF Compare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgoubet
Bu
m
p versions to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
l
g
o
u
b
et
Adapt
t
ests to EGit c
h
ange o
f
beh
a
vior
commit
|
commitdiff
|
tree
2019-05-29
l
g
oubet
Ena
b
le users to merge all
c
onflicts at once
t
hrough
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Merging sin
g
le-valued containment changes ca
n
lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoub
e
t
Ty
p
o
s
commit
|
commitdiff
|
tree
2019-05-23
lgoub
e
t
Prevent LCS computation when we d
o
not nee
d
ordering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgo
u
bet
Prevent d
u
p
licate inser
t
ion points to be shown in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgoubet
Prevent
C
MV disposal
w
hen us
e
r selects
m
ultiple
e
lements
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgoubet
O
n
ly ad
d
new
adapte
r
s w
h
e
n
needed
commit
|
commitdiff
|
tree
2019-04-14
lgo
u
bet
Iterate
over th
e
dif
f
erences instead of th
e
matche
s
commit
|
commitdiff
|
tree
2019-04-09
lgo
u
b
e
t
Pre
v
ent OutOfMemory
E
rrors fro
m
th
e
UI
whe
n
switc
h
i
n
g
CMV
commit
|
commitdiff
|
tree
2019-04-08
l
goubet
P
erforma
n
c
e - Computing re
q
uirements
times
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
The UML tests shouldn't use a ca
c
hed instance
of EMFCompare
commit
|
commitdiff
|
tree
2019-04-03
lgoubet
Restore possibil
i
ty to remove mergers from th
e
registry
commit
|
commitdiff
|
tree
2019-03-22
lgoubet
Make sure we hook the UI whe
n
users p
r
ov
i
de a precomputed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Bump EMF Compare to
3
.
3
.
7
i
n prepara
t
ion for 2019-06
commit
|
commitdiff
|
tree
2019-03-21
l
goubet
Disposing
o
f the comparison shouldn't
b
e done by the SMV
commit
|
commitdiff
|
tree
2019-03-04
lg
o
ubet
Av
o
i
d Clas
s
CastE
x
cept
i
on when merg
i
ng feature map changes
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Bump v
e
r
s
ions
for 3
.
3
.
6
for 2019-03
commit
|
commitdiff
|
tree
2019-02-26
l
g
oub
e
t
p
atch ModelGitMer
g
eEditorInput for EGit 5
.
3
.
0 com
p
atibility
commit
|
commitdiff
|
tree
2019-02-26
lgou
b
et
Sup
p
r
e
s
s
guav
a
n
e
sted
c
o
n
cat
e
nations
commit
|
commitdiff
|
tree
2019-02-11
l
goubet
Rem
o
ve accident
a
l
u
s
e of Guav
a
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
SWTExc
e
ption when
s
w
i
tching comp
a
risons
in a compare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgoub
e
t
Al
l
ow clients to
provide
p
r
e
-comp
u
ted compariso
n
s to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
l
goubet
Ignore failing git tests
for now
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Bump versio
n
s
t
o
3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
l
g
oubet
Use a r
e
leased version of Sirius
commit
|
commitdiff
|
tree
2018-11-30
l
goubet
[541730] Reverts d
5
9c924 due to an UI f
r
eeze
commit
|
commitdiff
|
tree
2018-06-22
lgo
u
bet
bump f
e
atu
r
e
version
s
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bump v
e
rsions
commit
|
commitdiff
|
tree
2018-06-22
lgoube
t
EM
F
Compare is no longe
r
compatible with egit < 4
.
2
commit
|
commitdiff
|
tree
2018-06-05
lgoubet
I
ntroduce te
s
t for mer
g
e
s
with multip
l
e ancestors
commit
|
commitdiff
|
tree
2018-03-13
lgoub
e
t
Removing th
e
subversive integratio
n
plu
g
ins
commit
|
commitdiff
|
tree
2018-01-30
lgo
u
b
et
Bump plugin and
fe
a
ture vers
i
ons f
o
r
Ph
o
ton
commit
|
commitdiff
|
tree
2018-01-24
l
goubet
Removing the P
a
pyrus plugins and feature
s
fro
m
the
.
.
.
commit
|
commitdiff
|
tree
2013-07-12
lgoubet
[410737] pr
e
serve order
i
ng even for equivalent
d
iffe
r
enc
e
s
.
commit
|
commitdiff
|
tree
2013-01-18
lgou
b
et
[367475] Take
g
it specif
i
cities i
n
to
account when resol
v
ing
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
l
g
o
ubet
Renaming ResourceTraversal into StorageTraver
s
a
l to
commit
|
commitdiff
|
tree
2012-10-31
lgo
u
bet
Displa
y
a prop
e
r name fo
r
t
h
e referenc
e
s when th
e
diff
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
l
goubet
info
r
m
ation ret
u
rned i
f
th
e
lo
g
ical model resolution
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
Use the sam
e
ellision for Attri
b
ute a
n
d
r
efere
n
ce labe
l
s
commit
|
commitdiff
|
tree
2012-10-31
l
g
oubet
Properly di
s
play differenc
e
th
a
t ar
e
not directly
r
efi
n
ed
commit
|
commitdiff
|
tree
2012-10-22
lgoubet
Preve
n
t
merging
t
ow
a
r
ds t
h
e gi
t
ind
e
x
(or other remote
.
.
.
commit
|
commitdiff
|
tree
2012-10-22
lgoubet
Lo
w
er the num
b
er of
t
hreads : our
b
ott
l
enec
k
is the
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
l
g
ou
b
et
W
h
en restruct
u
ring the matc
h
m
odel
commit
|
commitdiff
|
tree
2012-10-19
l
goubet
T
his has nothing
to do as package vi
s
ible
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
Make
ResourceTraversal, R
e
so
u
rceUtil
and StorageURIConverter
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
l
g
oubet
Load the right versions of
t
he distan
t
fil
e
s
.
commit
|
commitdiff
|
tree
2012-10-19
l
g
oubet
The
UI shoul
d
us
e
p
o
st processors
commit
|
commitdiff
|
tree
2012-10-19
l
goubet
avoid d
o
uble scheme
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
Always prevent
load : ecore tends to loa
d
new resources
.
.
.
commit
|
commitdiff
|
tree
2012-10-15
lgoube
t
Le
a
ve the pos
s
i
b
ility for sub
-
classe to not have a
.
.
.
commit
|
commitdiff
|
tree
2012-10-15
lgoube
t
Supp
r
essing un
a
voidable
warning
commit
|
commitdiff
|
tree
2012-10-15
lgo
u
bet
Commenti
n
g, and re
d
ucing the nesting count of getDELOr
i
ginVa
.
.
.
commit
|
commitdiff
|
tree
2012-10-15
lgoubet
R
edu
c
in
g
nesting
commit
|
commitdiff
|
tree
2012-10-15
lgoub
e
t
Missing ta
g
s
commit
|
commitdiff
|
tree
2012-10-15
l
goube
t
Comme
n
tin
g
commit
|
commitdiff
|
tree
2012-10-15
lgoubet
Unuse
d
fie
l
d
commit
|
commitdiff
|
tree
2012-10-05
l
goubet
T
he reso
l
vi
n
g call here is quite cost
l
y
.
Try a
n
d
o
nly
.
.
.
commit
|
commitdiff
|
tree
2012-10-05
lg
o
ubet
Perf - A
v
oid d
e
ep nesti
n
g o
f
t
he
c
oncatenated oper
a
tors
commit
|
commitdiff
|
tree
2012-10-05
lgoubet
Merging Cedric's changes
commit
|
commitdiff
|
tree
2012-10-05
lgou
b
et
Typ
o
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
"
private
"
is "final
"
by definition :)
commit
|
commitdiff
|
tree
2012-10-03
lgou
b
et
usel
e
ss cond
i
tion
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
P
M
D fa
i
led at parsin
g
t
hi
s
.
commit
|
commitdiff
|
tree
2012-10-03
l
g
ou
b
et
Synchro
n
izat
i
on hell
.
T
h
e smart scop
e
still presented
.
.
.
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
Properly remove read-on
l
y resourc
e
s
commit
|
commitdiff
|
tree
next