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 versions
2018-06-22
lgoubet
bump versi
o
n
s
commit
|
commitdiff
|
tree
2018-06-22
S
téphane
Thib
a
udeau
Exten
s
ion p
o
int
t
o
provide specific matching r
u
les
.
.
.
commit
|
commitdiff
|
tree
2018-06-22
Sté
p
hane Thi
b
audeau
Remove
u
seless and myst
e
riou
s
code
commit
|
commitdiff
|
tree
2018-06-22
Stép
h
ane Thibaudeau
EMF Compa
r
e
i
s
compatible with JGit 5
.
*
versions
commit
|
commitdiff
|
tree
2018-06-22
S
t
éphane Thibaudeau
Add ex
p
licit dependency t
o
or
g
.
ec
l
ipse
.
gef
commit
|
commitdiff
|
tree
2018-06-22
S
t
éphane Thibaudeau
Do not minimi
z
e identical resour
c
es when
X
t
e
xt is used
commit
|
commitdiff
|
tree
2018-06-22
St
é
phane Thibaudeau
Use white-li
s
t s
t
rategy to ret
r
ieve the Mo
d
el p
r
ovider
commit
|
commitdiff
|
tree
2018-06-22
S
t
é
p
hane
Thibaudea
u
Be
t
ter handling of
Xtext wi
t
h Live
s
cope option
commit
|
commitdiff
|
tree
2018-06-22
lg
o
u
b
e
t
EMF Compa
r
e
i
s no longer c
o
mpatib
l
e with egit
<
4
.
2
commit
|
commitdiff
|
tree
2018-06-05
l
g
oubet
Introduce test
f
or mer
g
es
w
i
th
m
ul
t
iple ancestor
s
commit
|
commitdiff
|
tree
2018-06-04
Arthu
r
Daus
s
y
[
5
34365]
F
i
x Re
c
u
rsiveModelMerg
e
r for "bi
n
ary"
g
it
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
A
r
th
u
r Daussy
Do not han
d
le "mer
g
ed"
files twice when JGit
stages
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
Art
h
ur Daussy
[
5
35200]
Create a new TreeWalk ins
t
ead reusing one
commit
|
commitdiff
|
tree
2018-05-03
Phi
l
ip Langer
Improve performance of
DiffUtil
commit
|
commitdiff
|
tree
2018-05-03
Philip Langer
Improve
pe
r
f
o
rmance of Comparis
i
onUtil
commit
|
commitdiff
|
tree
2018-05-03
Philip L
a
nger
I
mpro
v
e
p
erf
o
rmance
of equality helper
commit
|
commitdiff
|
tree
2018-05-01
Christian W
.
D
a
m
us
[525473] [Papyrus] Conn
e
ct
i
on
s
d
isappear wh
e
n comparing
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip La
n
g
er
Avoid visiting elements m
u
ltiple times
in Grap
h
.
ParentsIt
e
rator
commit
|
commitdiff
|
tree
2018-05-01
Christian W
.
Damus
[5252
8
6
]
[Papyrus] Diffs i
n
invisible
s
tereotype pro
p
erty
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
[521
9
40] P
r
eve
n
t index ou
t
of bounds exception
o
n empty
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip
L
anger
SWTU
t
il
.
safeR
e
draw
s
ho
u
l
d
check
for dis
p
o
s
ed control
commit
|
commitdiff
|
tree
2018-05-01
Philip La
n
ger
[5
2
7567] G
e
ner
a
lize the tabl
e
and t
r
e
e merge viewer
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Cami
l
le Le
t
avernier
[529882] S
y
nc
h
ro
n
i
ze
z
oom levels and allow changing
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Ph
i
lip Langer
Impro
v
e per
f
orm
a
nc
e
of the me
r
ging pr
o
cess
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
Improve
performance of
IDiffRelation
s
h
i
pComputer
im
p
l
e
menta
t
ions
commit
|
commitdiff
|
tree
2018-05-01
Philip Lan
g
er
Improve perfor
m
ance of A
b
stract
C
opyC
o
mmand
.
g
e
tChangedDiff
s
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
[52
7
864] Prevent CMV
l
ines to be broken afte
r
merging
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
[
5
27858]
S
el
e
cting a diff
with
confl
i
cts fail
s
commit
|
commitdiff
|
tree
2018-05-01
P
hilip
L
an
g
er
[527567] Di
a
g
r
amCo
m
pareIt
e
mProv
i
derAdapterFactory should
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Phi
l
ip
L
an
g
er
[508526] Imp
r
ove text compare
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
The sh
o
w
m
erge consequence
s
c
o
ntrol
i
s
c
onfusi
n
g
when
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
EMFCompareStructureMergeViewer d
o
es
much redundan
t
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
P
h
il
i
p
Langer
Sup
p
ort
k
ey
b
i
ndings for
c
o
mmonly used mer
g
e/
n
avigate
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
I
m
prov
e
M
a
nyStructu
r
alFeatureA
c
cessorImpl
.
getDiffWithValue
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Ph
i
lip
Langer
Improve IMe
r
ger registr
y
implemen
t
ation
commit
|
commitdiff
|
tree
2018-05-01
Phili
p
Lang
e
r
Imp
r
ove performanc
e
o
f
t
e
xtual value
match
i
ng
commit
|
commitdiff
|
tree
2018-04-30
Ph
i
lip Langer
I
mpro
v
e
p
erfo
r
manc
e
of
Compa
r
isonSpec
commit
|
commitdiff
|
tree
2018-04-30
Philip Langer
Av
o
i
d
expe
n
sive no
t
ificatio
n
s proces
s
ing a
f
ter co
m
p
are
.
.
.
commit
|
commitdiff
|
tree
2018-04-30
Philip Lan
g
er
D
e
cre
a
se pro
g
ress monitor
i
ng over
h
e
a
d
commit
|
commitdiff
|
tree
2018-04-30
Phil
i
p Langer
Ab
s
tr
a
c
tStructural
F
eatureAccessor
.
computeDifferences
.
.
.
commit
|
commitdiff
|
tree
2018-04-30
P
hilip Langer
Cache StructureMerg
e
V
i
ewerFi
l
t
e
r res
u
lts
commit
|
commitdiff
|
tree
2018-04-25
Phili
p
Langer
[522422] Lab
e
l-based co
n
t
e
nt
view
e
r should
clean up
.
.
.
commit
|
commitdiff
|
tree
2018-04-19
P
h
i
lip Lan
g
e
r
[5
2
1
9
4
8
]
S
uppor
t
c
han
g
ing
t
h
e sta
t
e of diffs a
l
ready
.
.
.
commit
|
commitdiff
|
tree
2018-04-19
Philip Langer
[516
2
48] Improve
N
avi
g
atab
l
e
ca
c
hing
commit
|
commitdiff
|
tree
2018-04-19
M
a
rtin Fleck
[5
1
6248
]
Actions for pre
v
i
ous/ne
x
t un
r
esolved
c
hange
commit
|
commitdiff
|
tree
2018-03-19
Laurent Goubet
P
r
ox
y
loading f
r
om
the merge tool
commit
|
commitdiff
|
tree
2018-03-16
L
a
urent Goubet
Allow
proxy resolution from
th
e
EMF Co
m
p
a
re
c
on
t
e
n
t
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laur
e
nt Goube
t
A
l
low proxy resolution
f
r
o
m
the EM
F
Compare structure
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Ph
i
lip Lan
g
er
Allo
w
loading
r
eferenced
r
esou
r
ces af
t
er
t
he c
o
mparison
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
L
aurent Gou
b
et
SMV action to r
e
ve
a
l all diff
e
r
e
nces i
n
conf
l
ic
t
with
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent Goubet
A
d
d
a
ctions
to merge everythi
n
g
to
"ge
t
r
i
ght
"
or
.
.
.
commit
|
commitdiff
|
tree
2018-03-15
P
hilip
Lan
g
er
[521886] Int
r
oduce
a
ction to res
o
lve multiple conflicts
commit
|
commitdiff
|
tree
2018-03-13
Philip Langer
[521886] Avoi
d
validation
in EMFCompareEditingDomain
commit
|
commitdiff
|
tree
2018-03-13
Lau
r
e
nt Go
u
bet
No changes s
h
own
w
hen t
h
er
e
is an added
Sirius diagram
commit
|
commitdiff
|
tree
2018-03-13
Laurent Go
u
bet
Memory leak f
r
o
m
the EMFModelPr
o
vider
.
context
T
oResourceMappi
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
Laure
n
t
Gou
b
et
Memor
y
lea
k
s wh
e
n comparing Sirius diagrams
commit
|
commitdiff
|
tree
2018-03-13
l
g
oubet
Removing
t
he subversive integra
t
ion plugins
commit
|
commitdiff
|
tree
2018-03-13
L
a
u
r
ent Goubet
XMI files ar
e
not a
l
w
a
ys
m
odels
commit
|
commitdiff
|
tree
2018-03-13
Laurent Goubet
Memory leak
d
uring automati
c
merge operation
s
fro
m
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
Laurent Goube
t
Do
n
't return null fr
o
m ITypedElement
.
getName()
.
commit
|
commitdiff
|
tree
2018-03-12
L
a
u
rent Goubet
[
532069] Invalid lo
g
ical model for S
y
nchronize with
.
.
.
commit
|
commitdiff
|
tree
2018-02-05
C
hristian W
.
Damus
[522064] Profi
l
e-
a
pplication version che
c
k to
o
restrictive
.
.
.
commit
|
commitdiff
|
tree
2018-02-02
Philip Langer
Add progress report
i
n
g
f
or post processors
commit
|
commitdiff
|
tree
2018-01-30
l
gou
b
e
t
B
ump plugin and feature versi
o
n
s
for Photon
commit
|
commitdiff
|
tree
2018-01-24
Arthur Daussy
[530
2
50] Fix
RecursiveMode
l
Merger to b
e
able t
o
handle
.
.
.
commit
|
commitdiff
|
tree
2018-01-24
lgoubet
Re
m
oving the Pap
y
r
us plugins and
featur
e
s from
the
.
.
.
commit
|
commitdiff
|
tree
2017-10-09
Antonio Campesino
[5
2
55
5
7] Rigth Taver
s
al override with Base traversal
.
.
.
commit
|
commitdiff
|
tree
2017-10-09
Laure
n
t Goubet
A
P
I
b
r
e
a
k
in JG
i
t 4
.
9 due to the
f
ix for bug
51
7
128
commit
|
commitdiff
|
tree
2017-09-08
Alexandra Buzila
[5
1
3931] Fix Deadlo
c
k in StructureMer
g
eViewer
commit
|
commitdiff
|
tree
2017-09-08
Laurent
Goubet
[
5
104
2
0] A
d
ding missing
e
x
t
ension poi
n
t
definition
s
.
.
.
commit
|
commitdiff
|
tree
2017-09-08
Mar
t
in Fleck
[518957] Reuse Seman
t
icUMLContent
P
rovider instance
.
.
.
commit
|
commitdiff
|
tree
2017-09-08
P
h
ilip L
a
nge
r
A
void NPE in
M
atchUtil and I
O
O
B
in
ReferenceCh
a
nge
M
erg
e
r
commit
|
commitdiff
|
tree
2017-09-08
P
hilip Lang
e
r
[515581] Make test plug-ins available from th
e
update
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Martin Fleck
[516060] Op
a
que Action
B
o
d
y con
f
lict resolution
resul
t
s
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Laurent Goubet
[515591] Try a
n
d fix
random t
e
s
t
fail
u
res
commit
|
commitdiff
|
tree
2017-09-07
M
a
rt
i
n Fleck
[5
1
8572] Navig
a
ta
b
le shou
l
d use content p
r
ovi
d
er to
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Mathieu
C
artaud
[51
8
760] Remove legacy JUnit3 artefacts
commit
|
commitdiff
|
tree
2017-09-07
Martin Fle
c
k
[518
9
68] Only traverse a
n
d cac
h
e
n
ece
s
s
a
r
y Papyrus
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Mart
i
n Fleck
[518983] C
o
mpareInputAdapter shoul
d
c
ache anc
e
stor
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Mart
i
n
F
l
e
c
k
[518986] Title of
c
om
p
are editor should
be co
m
p
u
t
ed
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Mar
t
in Fle
c
k
[519003]
Ensure
u
ndo/re
d
o is a
c
tivat
e
when SMV has
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
L
a
urent Goubet
performance plugin issues
commit
|
commitdiff
|
tree
2017-09-05
Math
i
e
u
Cartau
d
[46
2
863] Staging Prompt
a
fter Res
o
l
vin
g
Conflic
t
s
commit
|
commitdiff
|
tree
2017-09-05
Mart
i
n
Fleck
[5
1
8981] Always use sp
e
cialized logic w
h
en using
R
evision
e
dU
.
.
.
commit
|
commitdiff
|
tree
2017-08-31
Martin Flec
k
[
5
19
0
25]
Only consider referenc
e
s when
findi
n
g s
t
ereotype
.
.
.
commit
|
commitdiff
|
tree
2017-08-31
Laur
e
nt Goub
e
t
[52
1
358] documenta
t
ion
f
or EMFCompar
e
RCPPl
u
g
in missing
.
.
.
commit
|
commitdiff
|
tree
2017-08-31
Christian W
.
D
a
mu
s
[520105]
[Tests] Maven execution of
G
i
t tests fails
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
L
aurent Goub
e
t
Bumping
v
ersi
o
ns
fo
r
Oxygen
.
1
commit
|
commitdiff
|
tree
2017-08-23
Laur
e
nt Goube
t
Remo
v
ing non fu
n
ctional profiles fr
o
m
pom
commit
|
commitdiff
|
tree
2017-08-22
Laurent Goubet
Sep
a
rate core & ex
t
ra b
u
ild
s
commit
|
commitdiff
|
tree
2017-07-21
Martin Fleck
Relax Co
m
pare Considerati
o
ns of I
M
ergeViewerItems
commit
|
commitdiff
|
tree
2017-07-20
Philip Lange
r
A
dd
a
few missin
g
license headers
commit
|
commitdiff
|
tree
2017-07-07
Philip Lange
r
Refactorings to imp
r
ove per
f
o
rman
c
e of MatchUtil
commit
|
commitdiff
|
tree
2017-07-07
Laurent Goubet
[5
1
8612]
Frequent CME from the adapter factor
y
d
i
s
pos
a
l
commit
|
commitdiff
|
tree
2017-07-07
Ma
r
tin Fleck
[518979] Re
m
ove c
o
ntext entries wi
t
h
an
empty cache
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Martin Fleck
[5190
1
6] Avoid r
e
pe
a
t
e
d
resour
c
e traver
s
al when resol
v
ing
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Martin Fleck
[5
1
90
3
3] Do not
refresh the SMV viewer after every
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Martin Fleck
[
519023]
Check cancella
t
ion l
e
s
s f
r
equent
l
y in
conflict
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Philip Langer
[5165
2
4] Use mo
r
e efficie
n
t fea
t
ure look-up
in ReferenceUtil
commit
|
commitdiff
|
tree
2017-07-06
Christian W
.
Damus
[519261] [Oomph]
S
etup model problems for O
x
y
gen
commit
|
commitdiff
|
tree
next