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
Bump version to 3.3.18
2019-05-29
lgoubet
Enabl
e
user
s
to
m
erge all con
f
l
i
cts
at onc
e
through
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgo
u
bet
M
e
r
g
in
g
single-
v
alued containme
n
t c
h
anges can le
a
d
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgou
b
et
Ty
p
os
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Prevent
L
CS computation whe
n
we do not nee
d
o
r
derin
g
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
l
g
oubet
Prevent duplicate inserti
o
n
points to be shown in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgoubet
Preven
t
C
MV
disposa
l
when
user selects mul
t
i
ple el
e
ments
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgou
b
et
On
l
y
a
dd new adapters when needed
commit
|
commitdiff
|
tree
2019-04-14
lgoubet
It
e
ra
t
e over the
d
ifferen
c
e
s
instead of the matches
commit
|
commitdiff
|
tree
2019-04-09
l
g
oubet
Prevent
OutOfMemoryErrors from
t
he UI whe
n
switching CM
V
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
Perf
o
rmance - Com
p
uting requ
i
reme
n
ts times
commit
|
commitdiff
|
tree
2019-04-08
l
goube
t
The UML tests shoul
d
n't us
e
a cached
instan
c
e of E
M
FCompa
r
e
commit
|
commitdiff
|
tree
2019-04-03
lgou
b
e
t
Restore possibility to remove mergers from the regis
t
ry
commit
|
commitdiff
|
tree
2019-04-01
William Piers
Fixed ArrayOutOf
B
oun
d
s in case of
e
mpty lists
commit
|
commitdiff
|
tree
2019-03-22
lg
o
ubet
Make
sure we hook the UI when users provide a
p
r
e
c
o
m
puted
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lg
o
ubet
Bump EMF
Co
m
pare to 3
.
3
.
7
i
n
prepa
r
ation f
o
r 20
1
9
-06
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Disp
o
sing of the comparison shouldn
'
t
be do
n
e by the
S
MV
commit
|
commitdiff
|
tree
2019-03-04
l
g
o
ubet
Avoid C
l
assCastException when merging featur
e
map changes
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Bump v
e
rsions fo
r
3
.
3
.
6 for 20
1
9-
0
3
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
p
a
tch ModelGitMergeEd
i
torInput for E
G
i
t 5
.
3
.
0
compatibility
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Suppre
s
s
guava nested concate
n
a
t
ions
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Remo
v
e accidental use of
Guava
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
SWTException
when
s
witching compar
i
s
o
n
s in a compare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
l
goubet
Allow
clients to
p
rovide pre-computed compari
s
ons to
.
.
.
commit
|
commitdiff
|
tree
2018-12-11
Philip La
n
g
er
[527567]
Provide support for a general prop
e
rty merge
.
.
.
commit
|
commitdiff
|
tree
2018-12-11
Philip Lang
e
r
[514079
]
Improve
mir
r
o
ring sup
p
ort
commit
|
commitdiff
|
tree
2018-12-04
lg
o
u
b
et
Ig
n
ore fa
i
ling git tests for n
o
w
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Bu
m
p versio
n
s t
o
3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Us
e
a released
v
er
s
ion o
f
Sirius
commit
|
commitdiff
|
tree
2018-11-30
lgoubet
[541730] Reverts d59c924
d
ue to an UI freeze
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bump feature versions
commit
|
commitdiff
|
tree
2018-06-22
l
gou
b
et
bump v
e
r
s
ions
commit
|
commitdiff
|
tree
2018-06-22
Stéph
a
ne
Th
i
baudeau
Extension point to provide specific m
a
tchin
g
rul
e
s
.
.
.
commit
|
commitdiff
|
tree
2018-06-22
Stép
h
ane
T
hi
b
aude
a
u
R
e
m
o
ve u
s
eless a
n
d
mysterious code
commit
|
commitdiff
|
tree
2018-06-22
Stéphane Thib
a
udeau
E
M
F Com
p
are is com
p
atib
l
e with JGit 5
.
* vers
i
ons
commit
|
commitdiff
|
tree
2018-06-22
Stép
h
an
e
Th
i
baudeau
Add explicit dependency
t
o org
.
e
cli
p
s
e
.
gef
commit
|
commitdiff
|
tree
2018-06-22
Sté
p
hane
T
hibau
d
eau
Do not
m
inimize ident
i
cal
r
e
sourc
e
s
when
Xtext is used
commit
|
commitdiff
|
tree
2018-06-22
Stéphane Thibaudeau
Use white-
l
ist
s
t
r
ategy t
o
retr
i
e
v
e the Mo
d
e
l
pro
v
i
d
er
commit
|
commitdiff
|
tree
2018-06-22
Stépha
n
e Thi
b
aud
e
a
u
B
etter hand
l
ing of Xte
x
t with Live
s
c
o
pe
option
commit
|
commitdiff
|
tree
2018-06-22
lgoube
t
EM
F
Compa
r
e
is no
longer compatible with
egit <
4
.
2
commit
|
commitdiff
|
tree
2018-06-05
lgoubet
I
ntroduce test for mer
g
es with mult
i
p
l
e ances
t
ors
commit
|
commitdiff
|
tree
2018-06-04
Ar
t
hur Daussy
[53
4
3
6
5] Fix RecursiveModelMe
r
ger
for "
b
inary" git
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
Arthu
r
D
a
uss
y
Do not handle "me
r
ge
d
" files twice when
J
Git stages
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
Arthur Dau
s
sy
[
5
3
5200] Creat
e
a new TreeWa
l
k inst
e
a
d
r
eusing one
commit
|
commitdiff
|
tree
2018-05-03
Phili
p
L
ange
r
Improv
e
perform
a
nce o
f
DiffUti
l
commit
|
commitdiff
|
tree
2018-05-03
Philip Langer
Imp
r
ove performance
of ComparisionUtil
commit
|
commitdiff
|
tree
2018-05-03
P
h
ilip
L
anger
Improve p
e
rforman
c
e
of equality
h
elper
commit
|
commitdiff
|
tree
2018-05-01
C
h
ristian
W
.
Damus
[525473] [Papyru
s
] Connections disappear
whe
n
co
m
paring
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Phi
l
ip Langer
Avo
i
d
v
i
s
itin
g
ele
m
ents m
u
ltiple times in G
r
aph
.
Pa
r
en
t
sIterato
r
commit
|
commitdiff
|
tree
2018-05-01
Christian W
.
D
a
mus
[52528
6
] [Papyrus] D
i
ffs
i
n
invi
s
ible st
e
reotype p
r
operty
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
[52
1
940] Prevent ind
e
x out of bou
n
ds exception on empty
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Ph
i
lip L
a
nge
r
S
WTUt
i
l
.
safeRedraw should check for di
s
p
osed
co
n
trol
commit
|
commitdiff
|
tree
2018-05-01
Philip La
n
ger
[
5
27567] Generalize the
t
ab
l
e
a
nd tree merge viewer
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
C
amil
l
e Letavern
i
er
[52988
2
] Synchronize zo
o
m l
e
vels and a
l
low changing
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
P
h
ili
p
L
a
nger
I
m
pro
v
e pe
r
formance of the merging
proces
s
commit
|
commitdiff
|
tree
2018-05-01
P
h
i
l
i
p La
n
ger
Improve performance of IDi
f
fRelationshipCompute
r
implementa
t
ions
commit
|
commitdiff
|
tree
2018-05-01
Ph
i
lip Langer
Improve
p
erf
o
rm
a
nce
of Abst
r
actCopyCommand
.
getChangedDiffs
commit
|
commitdiff
|
tree
2018-05-01
Ph
i
lip L
a
nger
[52
7
864] Preven
t
CMV lines
t
o
b
e brok
e
n
after merging
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Lange
r
[
52
7
858] Sele
c
tin
g
a dif
f
with c
o
nflicts fai
l
s
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
[527567] DiagramC
o
mpare
I
temPro
v
iderAda
p
te
r
Factory sho
u
ld
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
P
h
ilip Langer
[508526] Impr
o
ve text compare
commit
|
commitdiff
|
tree
2018-05-01
Phi
l
ip Langer
The show merge consequence
s
control is
confusing
w
h
e
n
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
P
h
ilip Lang
e
r
EMFC
o
mpareStructureMergeView
e
r
d
o
e
s much
r
ed
u
ndant
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
Suppor
t
key bindings for
commonly used m
e
rge/navi
g
ate
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
Improve Man
y
StructuralFeatureAc
c
e
s
so
r
Impl
.
getD
i
f
f
W
i
thValue
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
P
hilip L
a
nger
Imp
r
o
ve IMerger re
g
istry i
m
plementation
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
Improv
e
pe
r
forman
c
e of tex
t
ual value
m
a
t
ching
commit
|
commitdiff
|
tree
2018-04-30
Philip La
n
ger
Improve
perform
a
n
c
e of Compa
r
isonSp
e
c
commit
|
commitdiff
|
tree
2018-04-30
Philip
L
anger
Av
o
id e
x
pensive noti
f
icati
o
n
s
processing after compare
.
.
.
commit
|
commitdiff
|
tree
2018-04-30
P
hilip Langer
Dec
r
ea
s
e progress monitoring overhead
commit
|
commitdiff
|
tree
2018-04-30
Philip Langer
AbstractSt
r
ucturalFeatureAccessor
.
co
m
puteD
i
fferences
.
.
.
commit
|
commitdiff
|
tree
2018-04-30
P
hilip La
n
ger
Cache Str
u
ctureMergeVi
e
werF
i
lt
e
r
results
commit
|
commitdiff
|
tree
2018-04-25
Ph
i
lip Langer
[
5
2
2
4
2
2]
L
abel-based c
o
ntent viewer should clean
up
.
.
.
commit
|
commitdiff
|
tree
2018-04-19
P
h
i
l
ip
Langer
[521948] Sup
p
o
r
t
c
h
a
nging
t
h
e state of dif
f
s
a
lready
.
.
.
commit
|
commitdiff
|
tree
2018-04-19
Philip Langer
[5
1
6248] Improve Nav
i
gatable cach
i
ng
commit
|
commitdiff
|
tree
2018-04-19
M
ar
t
in Flec
k
[51624
8
] Acti
o
n
s
f
or previous/next unresolved change
commit
|
commitdiff
|
tree
2018-03-19
Laurent
G
oube
t
Proxy loading from the merge tool
commit
|
commitdiff
|
tree
2018-03-16
La
u
r
e
n
t Goubet
Allow proxy r
e
solution fr
o
m the EMF Co
m
pa
r
e content
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent Go
u
b
e
t
Allow p
r
o
xy
r
esolutio
n
from the EMF Compar
e
str
u
cture
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Philip
L
a
ng
e
r
Allow
l
oading referenced resources a
f
ter the comp
a
rison
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
La
u
rent
G
o
ubet
SMV a
c
tion to
r
eveal all
d
ifferenc
e
s
in
conflic
t
w
ith
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent
Goubet
Add
actions to me
r
g
e
every
t
hing to "g
e
t right" or
.
.
.
commit
|
commitdiff
|
tree
2018-03-15
Philip Langer
[521886] Introduce action to
r
esolve multiple conflicts
commit
|
commitdiff
|
tree
2018-03-13
P
h
ilip Lang
e
r
[
521886] A
v
oid validation
i
n E
M
F
Compar
e
Edit
i
ngDoma
i
n
commit
|
commitdiff
|
tree
2018-03-13
Laurent
G
oubet
No chan
g
es shown
when there is an added
Sirius
d
i
a
gram
commit
|
commitdiff
|
tree
2018-03-13
L
a
urent Go
u
bet
Memory l
e
ak from the EMFModelProvider
.
contextToResourceMappi
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
La
u
r
e
nt Gou
b
et
Mem
o
ry lea
k
s when com
p
ari
n
g Siri
u
s d
i
agrams
commit
|
commitdiff
|
tree
2018-03-13
lgoubet
Removing the subversive integration p
l
ugins
commit
|
commitdiff
|
tree
2018-03-13
Laurent Go
u
b
e
t
XMI file
s
are not always
models
commit
|
commitdiff
|
tree
2018-03-13
L
aur
e
nt Goubet
M
emory
l
e
a
k
during automa
t
ic merge operatio
n
s from
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
Laure
n
t
Goubet
Don't
r
e
turn nu
l
l from ITy
p
e
d
E
le
m
e
n
t
.
ge
t
Name()
.
commit
|
commitdiff
|
tree
2018-03-12
Laurent Goubet
[532069] Invalid logical mode
l
f
o
r
S
ynchronize with
.
.
.
commit
|
commitdiff
|
tree
2018-02-05
Christian W
.
Dam
u
s
[522064] Profile-applica
t
ion
version
c
heck t
o
o re
s
tri
c
tive
.
.
.
commit
|
commitdiff
|
tree
2018-02-02
Phil
i
p La
n
ger
Add progr
e
s
s
reporting for p
o
st processors
commit
|
commitdiff
|
tree
2018-01-30
l
goubet
Bu
m
p
p
lu
g
i
n
and
f
e
a
tur
e
versi
o
n
s f
o
r Photon
commit
|
commitdiff
|
tree
2018-01-24
Arthu
r
D
a
u
s
sy
[530
2
5
0
] Fix
Re
c
u
rsi
v
eModelMerger
t
o be ab
l
e
to ha
n
d
le
.
.
.
commit
|
commitdiff
|
tree
2018-01-24
lgou
b
e
t
Remo
v
ing the Pap
y
rus plugins
a
n
d features fro
m
the
.
.
.
commit
|
commitdiff
|
tree
2017-10-09
Antonio Campesi
n
o
[525557]
Rigth Taversal override
w
ith Base traversal
.
.
.
commit
|
commitdiff
|
tree
2017-10-09
Laurent Gou
b
et
API b
r
eak in JGit 4
.
9
due t
o
t
h
e fix f
o
r bu
g
517128
commit
|
commitdiff
|
tree
2017-09-08
A
lexandra
B
uzila
[51
3
931] Fix Deadlo
c
k in StructureMe
r
geVie
w
er
commit
|
commitdiff
|
tree
2017-09-08
L
aurent Goube
t
[5104
2
0] Ad
d
in
g
mis
s
in
g
e
x
tension point definitions
.
.
.
commit
|
commitdiff
|
tree
next