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
[541730] Reverts d59c924 due to an UI freeze
2018-11-30
lgoube
t
[
5
41730] Re
v
erts d59c92
4
due to an UI freeze
commit
|
commitdiff
|
tree
2018-06-22
lg
o
u
b
et
bump feature v
e
rsio
n
s
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bump versions
commit
|
commitdiff
|
tree
2018-06-22
Stép
h
ane Thibaudeau
Exten
s
ion poi
n
t to provide specific
matching rules
.
.
.
commit
|
commitdiff
|
tree
2018-06-22
Stéphan
e
Thi
b
audeau
Remov
e
useless
a
nd myster
i
ous
code
commit
|
commitdiff
|
tree
2018-06-22
Stéphane
T
hiba
u
deau
E
M
F
Compar
e
is
c
ompa
t
i
b
le with JG
i
t 5
.
* versio
n
s
commit
|
commitdiff
|
tree
2018-06-22
Stépha
n
e
T
hibaudeau
Add explicit dependenc
y
to
org
.
ec
l
ipse
.
gef
commit
|
commitdiff
|
tree
2018-06-22
St
é
phane Thibaudeau
Do not
m
in
i
mize
i
dentical resource
s
when Xtext is used
commit
|
commitdiff
|
tree
2018-06-22
S
téphane Thib
a
udeau
Use whit
e
-lis
t
strategy to re
t
r
i
eve the
Model provider
commit
|
commitdiff
|
tree
2018-06-22
Stéphane Thibaudeau
Bett
e
r h
a
ndl
i
ng
of Xtext with Live
scope
option
commit
|
commitdiff
|
tree
2018-06-22
lg
o
u
b
et
EMF Compar
e
is
no longer compa
t
ibl
e
with egit
<
4
.
2
commit
|
commitdiff
|
tree
2018-06-05
lgoubet
Intr
o
duce test
f
or me
r
g
es with mu
l
tip
l
e anc
e
stors
commit
|
commitdiff
|
tree
2018-06-04
Ar
t
hur Daussy
[53436
5
]
Fi
x
R
e
cursiveMode
l
Merg
e
r for "b
i
n
ary" git
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
Art
h
ur Daussy
Do
n
ot handle "m
e
rge
d
" files
t
wice when JG
i
t s
t
ages
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
Ar
t
hu
r
Daussy
[535200]
C
reate a new T
r
eeWalk ins
t
ead
r
e
u
sing one
commit
|
commitdiff
|
tree
2018-05-03
Ph
i
lip Langer
Improve performance
o
f DiffUtil
commit
|
commitdiff
|
tree
2018-05-03
P
h
ilip
L
ang
e
r
I
mprove performance of ComparisionUtil
commit
|
commitdiff
|
tree
2018-05-03
Philip La
n
g
er
Improve performance of equality help
e
r
commit
|
commitdiff
|
tree
2018-05-01
Christian W
.
Da
m
us
[525473] [Papyrus] Co
n
nection
s
dis
a
ppear when c
o
mparing
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Phi
l
ip
L
a
n
ger
Avoid visiting elemen
t
s multipl
e
times in
G
raph
.
Par
e
nts
I
te
r
ator
commit
|
commitdiff
|
tree
2018-05-01
Christian W
.
Damus
[5252
8
6
]
[Pa
p
y
rus] Diffs in
i
nvisible s
t
ereotype property
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip
L
an
g
e
r
[
5
21
9
4
0
] Preve
n
t index out of bounds exception on em
p
t
y
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Ph
i
lip Langer
SWTUtil
.
saf
e
Redraw shoul
d
chec
k
for disposed
c
ontrol
commit
|
commitdiff
|
tree
2018-05-01
P
hilip
L
anger
[527567] Ge
n
eralize the t
a
ble and tre
e
merge viewer
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Camille
L
etaverni
e
r
[529882]
Synch
r
onize
z
o
om levels
and allow
changing
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
Improve
p
er
f
orm
a
nce
of the
m
e
r
ging proce
s
s
commit
|
commitdiff
|
tree
2018-05-01
Phil
i
p Langer
Impr
o
ve pe
r
forman
c
e of IDiff
R
elationshipComputer implementatio
n
s
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
Im
p
rove
p
er
f
ormance of
AbstractCo
p
yCommand
.
getChanged
D
iffs
commit
|
commitdiff
|
tree
2018-05-01
Ph
i
lip
Langer
[52786
4
] Prevent
CMV li
n
es to
be broken after
mer
g
i
ng
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Phi
l
ip Langer
[527858] Selecting
a diff wit
h
c
o
nflicts fails
commit
|
commitdiff
|
tree
2018-05-01
P
h
ilip
Langer
[
5
2
7567] DiagramC
o
mpare
I
te
m
ProviderAdapterF
a
ctory should
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
P
h
ilip Lan
g
er
[508526]
I
mp
r
ove text
compare
commit
|
commitdiff
|
tree
2018-05-01
Phi
l
ip Lan
g
er
Th
e
s
h
o
w
m
e
rge consequenc
e
s
con
t
rol is
confusing w
h
en
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
P
h
ilip Langer
E
M
F
Comp
a
reStruc
t
ureMergeViewer do
e
s much redundant
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
P
hilip L
a
nger
Suppor
t
key bindi
n
gs for
c
omm
o
nly us
e
d
merge/
n
a
vigat
e
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Lan
g
er
Improve ManyStr
u
ctur
a
lFeatureAccessor
I
mpl
.
getDiff
W
ithValue
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
Im
p
ro
v
e IM
e
rger registry implement
a
tion
commit
|
commitdiff
|
tree
2018-05-01
Philip
L
anger
Improv
e
perfo
r
mance of tex
t
ual value matching
commit
|
commitdiff
|
tree
2018-04-30
Philip Langer
Impr
o
ve perfo
r
mance
o
f ComparisonSpec
commit
|
commitdiff
|
tree
2018-04-30
P
hil
i
p
Langer
Avoid
expensi
v
e notifications proces
s
ing a
f
t
e
r compare
.
.
.
commit
|
commitdiff
|
tree
2018-04-30
Phili
p
Langer
D
e
crease
progress monitori
n
g
o
verhead
commit
|
commitdiff
|
tree
2018-04-30
Philip Langer
Abstra
c
tStr
u
ctur
a
l
F
eatureAccessor
.
computeDifferences
.
.
.
commit
|
commitdiff
|
tree
2018-04-30
Philip Langer
Cache Struct
u
r
e
MergeViewerFil
t
e
r res
u
lts
commit
|
commitdiff
|
tree
2018-04-25
Phil
i
p
Langer
[
5
22
4
22
]
L
a
bel-based
c
ont
e
nt viewer should clean up
.
.
.
commit
|
commitdiff
|
tree
2018-04-19
Phil
i
p Langer
[5
2
19
4
8] S
u
p
p
ort
c
hanging
t
he sta
t
e of di
f
fs alread
y
.
.
.
commit
|
commitdiff
|
tree
2018-04-19
P
hili
p
Lang
e
r
[516248] Improve Navigata
b
le cach
i
ng
commit
|
commitdiff
|
tree
2018-04-19
Martin
Fleck
[51
6
2
4
8] Actions for p
r
evious/next unre
s
o
lved chang
e
commit
|
commitdiff
|
tree
2018-03-19
Laure
n
t Goube
t
Proxy loading from the merge
tool
commit
|
commitdiff
|
tree
2018-03-16
Lauren
t
G
oubet
A
llow pr
o
xy resoluti
o
n from the
E
MF
C
ompar
e
content
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Lauren
t
Goubet
Allow
p
roxy
r
esolu
t
i
on
from
t
h
e EMF Compare
s
tructure
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Philip Lan
g
er
A
llow load
i
ng referenced
resources after the
c
omparison
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Lau
r
ent Goubet
S
MV action to r
e
v
e
al all
d
ifferences in conflict with
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent Goube
t
Add
actions
t
o merge everything
t
o
"g
e
t
right" or
.
.
.
commit
|
commitdiff
|
tree
2018-03-15
Philip Langer
[
52188
6
] Introdu
c
e action
to resolve
multiple conflicts
commit
|
commitdiff
|
tree
2018-03-13
Philip
L
a
nger
[52188
6
] A
v
oid validat
i
on
i
n E
M
FCompareEdi
t
in
g
Domain
commit
|
commitdiff
|
tree
2018-03-13
Laurent Goub
e
t
No changes shown when there is an added Sirius
d
iagram
commit
|
commitdiff
|
tree
2018-03-13
Laure
n
t Goube
t
Memory leak
f
rom t
h
e E
M
FM
o
delPro
v
i
d
er
.
contextTo
R
esourceMappi
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
L
a
urent Goubet
Memo
r
y leaks when comparing Sirius diag
r
ams
commit
|
commitdiff
|
tree
2018-03-13
lgoubet
Remo
v
ing the su
b
ve
r
sive integration plu
g
ins
commit
|
commitdiff
|
tree
2018-03-13
Lau
r
en
t
Goubet
XMI files
are not always model
s
commit
|
commitdiff
|
tree
2018-03-13
L
aurent Gou
b
et
Mem
o
r
y
leak d
u
ring automati
c
merge op
e
ration
s
from
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
Laure
n
t
Goube
t
Don't r
e
turn null from ITyp
e
d
E
l
ement
.
g
e
tN
a
me()
.
commit
|
commitdiff
|
tree
2018-03-12
Lau
r
en
t
G
oubet
[53
2
069] Invalid logical model for Synch
r
onize with
.
.
.
commit
|
commitdiff
|
tree
2018-02-05
C
hr
i
st
i
an W
.
Damus
[522064] Profi
l
e
-
application versi
o
n c
h
eck too
rest
r
icti
v
e
.
.
.
commit
|
commitdiff
|
tree
2018-02-02
Philip Lang
e
r
A
d
d p
r
ogr
e
ss r
e
port
i
ng for post
processors
commit
|
commitdiff
|
tree
2018-01-30
lgoubet
Bump
p
lug
i
n and feature versi
o
ns for P
h
oton
commit
|
commitdiff
|
tree
2018-01-24
A
r
t
h
ur Daussy
[
5
3025
0
]
Fix RecursiveModelMerger to be able
t
o
handle
.
.
.
commit
|
commitdiff
|
tree
2018-01-24
lgoube
t
Removing the Papyrus plug
i
n
s
a
n
d fea
t
ures from the
.
.
.
commit
|
commitdiff
|
tree
2017-10-09
Antonio Camp
e
sino
[5255
5
7] Rigt
h
T
a
v
e
rsal override w
i
t
h
Base tra
v
e
rsal
.
.
.
commit
|
commitdiff
|
tree
2017-10-09
Laurent Goubet
API break in JGit 4
.
9 due to the
fix for bug 517128
commit
|
commitdiff
|
tree
2017-09-08
Alexandra Buzila
[5139
3
1] Fix De
a
dloc
k
in Stru
c
tureMe
r
geViewer
commit
|
commitdiff
|
tree
2017-09-08
L
auren
t
Goubet
[510420] Ad
d
in
g
missing extension poi
n
t definitions
.
.
.
commit
|
commitdiff
|
tree
2017-09-08
Martin Fleck
[518957] Reuse Sem
a
nticUM
L
ContentProvider in
s
t
a
nce
.
.
.
commit
|
commitdiff
|
tree
2017-09-08
Phili
p
Langer
Avoid NPE in MatchUtil and IOOB in
ReferenceChangeM
e
rger
commit
|
commitdiff
|
tree
2017-09-08
Philip La
n
ger
[
5
1
5
581] Mak
e
test
p
l
ug-ins a
v
aila
b
le
f
rom t
h
e up
d
ate
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Martin Fle
c
k
[516060] Opaqu
e
Action
Body con
f
lict resolution resu
l
ts
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Lau
r
ent Goub
e
t
[515591] Try
a
n
d fix
r
andom t
e
st fail
u
r
es
commit
|
commitdiff
|
tree
2017-09-07
Martin Fleck
[51857
2
] Navig
a
table should use content p
r
ovider t
o
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Mathieu Cartaud
[
518760] Remo
v
e
legac
y
JUnit
3
ar
t
efacts
commit
|
commitdiff
|
tree
2017-09-07
Marti
n
Fleck
[518968] Only traverse and cache nece
s
sary
Papyrus
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Martin F
l
eck
[518983] Compar
e
I
n
putAdap
t
er should cache ancest
o
r
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Martin Fle
c
k
[
518986] Title of compare
e
di
t
or
s
houl
d
be computed
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Martin Fleck
[51
9
0
03] Ensure undo/re
d
o is a
c
tivate whe
n
S
MV has
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Laurent Goubet
p
e
rformance pl
u
g
i
n i
s
sues
commit
|
commitdiff
|
tree
2017-09-05
Mathieu
Cartaud
[4
6
2863]
S
tag
i
ng Prompt after Re
s
olving Conflicts
commit
|
commitdiff
|
tree
2017-09-05
Martin Fleck
[51
8
981]
Alwa
y
s use speci
a
li
z
e
d
logic whe
n
using Revi
s
ionedU
.
.
.
commit
|
commitdiff
|
tree
2017-08-31
Martin Fleck
[
5
19025]
O
nly consider references when
f
i
nding stereo
t
ype
.
.
.
commit
|
commitdiff
|
tree
2017-08-31
Lauren
t
Goubet
[5
2
1
358]
d
ocument
a
t
ion for EMFCompareRCPPl
u
gin m
i
ssing
.
.
.
commit
|
commitdiff
|
tree
2017-08-31
Christian
W
.
Dam
u
s
[520105]
[Test
s
] Maven execut
i
o
n of Git tests fails
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Lau
r
ent Go
u
b
e
t
Bumping ve
r
s
ion
s
for Oxygen
.
1
commit
|
commitdiff
|
tree
2017-08-23
La
u
rent Goubet
Remov
i
ng no
n
fun
c
t
i
o
n
al
profile
s
f
rom
po
m
commit
|
commitdiff
|
tree
2017-08-22
Lau
r
ent
G
oubet
Separate c
o
re &
extra b
u
i
l
ds
commit
|
commitdiff
|
tree
2017-07-21
M
artin F
l
eck
Re
l
ax
C
o
mpare Con
s
iderati
o
ns of IMerge
V
iewerItems
commit
|
commitdiff
|
tree
2017-07-20
Phi
l
ip Lange
r
Add a few missing licens
e
head
e
r
s
commit
|
commitdiff
|
tree
2017-07-07
P
h
ilip Langer
R
e
factor
i
n
gs to i
m
prove p
e
rfor
m
ance of M
a
tchUtil
commit
|
commitdiff
|
tree
2017-07-07
Laurent
Goub
e
t
[
5
18612] Frequent CME
f
ro
m
the adapt
e
r f
a
c
t
o
r
y
d
i
sposal
commit
|
commitdiff
|
tree
2017-07-07
Martin Fleck
[518979] R
e
m
o
ve c
o
n
t
ext entri
e
s with
a
n empty
cache
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Martin
Fleck
[519016] Avoid
re
p
eated resour
c
e trav
e
rsal when resolving
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Martin Fle
c
k
[519033] Do
not
r
e
f
resh the
S
MV viewer afte
r
ever
y
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Martin Fleck
[519023] Check cancel
l
ation
less frequent
l
y
in conflict
.
.
.
commit
|
commitdiff
|
tree
next