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
[535200] Create a new TreeWalk instead reusing one
2018-06-04
Ar
t
hur Daussy
[53520
0
] Create a new Tre
e
Walk i
n
stead re
u
s
ing
on
e
commit
|
commitdiff
|
tree
2018-05-01
C
hristian W
.
Damus
[525473] [Papyrus] Connections disappear when comp
a
ring
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
A
vo
i
d visiting elements multiple times in Graph
.
Parents
I
terator
commit
|
commitdiff
|
tree
2018-05-01
Chris
t
ian W
.
Da
m
u
s
[525286] [Papyrus]
D
iffs
i
n in
v
isibl
e
stereotype
p
roperty
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Phil
i
p Lange
r
[521940] Prevent index out of bound
s
exception on empty
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Lan
g
er
SWTUtil
.
s
afeRe
d
raw sh
o
uld check for disposed contro
l
commit
|
commitdiff
|
tree
2018-05-01
P
hilip Lan
g
e
r
[527567]
G
eneral
i
ze the
t
able and tree mer
g
e viewer
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Camille Leta
v
e
rnier
[529882]
S
y
nchroniz
e
zo
o
m levels
a
n
d allow changing
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Phili
p
Langer
Improve performanc
e
of the mer
g
ing process
commit
|
commitdiff
|
tree
2018-05-01
Philip
L
anger
Impro
v
e
p
e
r
f
ormance
o
f IDiffRelationshi
p
Computer implemen
t
a
tions
commit
|
commitdiff
|
tree
2018-05-01
Philip L
a
nger
Im
p
rove per
f
ormance of AbstractC
o
p
yCommand
.
getChan
g
edDiffs
commit
|
commitdiff
|
tree
2018-05-01
Philip
L
anger
[527864] Preven
t
CMV l
i
nes
t
o be b
r
oken afte
r
me
r
ging
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
[527858] S
e
lecting a diff with c
o
n
f
licts fai
l
s
commit
|
commitdiff
|
tree
2018-05-01
Phi
l
i
p Langer
[527567
]
Diag
r
amCompar
e
I
temPro
v
iderAdap
t
erFactor
y
sho
u
ld
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Phi
l
ip
Langer
[508526] Improve text compare
commit
|
commitdiff
|
tree
2018-05-01
Philip Lange
r
The show
mer
g
e consequences c
o
ntrol is conf
u
sin
g
w
h
en
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Phil
i
p Langer
EMFCompa
r
eStru
c
t
u
r
eMerg
e
Viewer does muc
h
redundant
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip
L
anger
Support key b
i
n
d
ings
for common
l
y use
d
me
r
ge/navigate
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
I
mprove ManyStructuralFea
t
ureAccessorImpl
.
getDiffWithValue
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
I
mprov
e
IMerg
e
r reg
i
stry implem
e
n
tation
commit
|
commitdiff
|
tree
2018-05-01
Phili
p
L
a
n
ger
I
mprove performanc
e
of textual v
a
lue matchi
n
g
commit
|
commitdiff
|
tree
2018-04-30
P
h
i
l
ip Lan
g
e
r
I
m
prove perfo
r
man
c
e of Co
m
parisonS
p
ec
commit
|
commitdiff
|
tree
2018-04-30
P
h
ilip
Langer
Avoid exp
e
n
sive
notifications proce
s
sing after compare
.
.
.
commit
|
commitdiff
|
tree
2018-04-30
Phil
i
p Langer
D
ecrease progress monito
r
ing overhead
commit
|
commitdiff
|
tree
2018-04-30
Philip Lan
g
e
r
Abstrac
t
Str
u
cturalFeatureAccessor
.
compu
t
e
D
i
fferences
.
.
.
commit
|
commitdiff
|
tree
2018-04-30
Phil
i
p Lan
g
er
Cac
h
e StructureM
e
rgeViewerFilter res
u
lts
commit
|
commitdiff
|
tree
2018-04-25
Phi
l
ip Langer
[522422] Label
-
b
a
sed content view
e
r should clean up
.
.
.
commit
|
commitdiff
|
tree
2018-04-19
Philip L
a
nger
[521948] S
u
pport changi
n
g t
h
e state of diffs already
.
.
.
commit
|
commitdiff
|
tree
2018-04-19
Ph
i
lip Langer
[5162
4
8] Improve Navigatable c
a
chi
n
g
commit
|
commitdiff
|
tree
2018-04-19
Mart
i
n Flec
k
[516248] Act
i
ons f
o
r
p
r
evious/nex
t
u
n
reso
l
ved change
commit
|
commitdiff
|
tree
2018-03-19
Lauren
t
Gou
b
et
Proxy loadi
n
g
f
r
om the merge tool
commit
|
commitdiff
|
tree
2018-03-16
Philip Langer
A
l
low loading re
f
erenced re
s
ources after the com
p
arison
.
.
.
commit
|
commitdiff
|
tree
2018-03-15
P
h
i
l
i
p Langer
[52188
6
] Introduce act
i
on
to
resolve
mul
t
i
ple
c
onf
l
ict
s
commit
|
commitdiff
|
tree
2018-03-13
Philip Langer
[
5
21886]
Avo
i
d valid
a
tion in EMFCompareEditingDo
m
ain
commit
|
commitdiff
|
tree
2018-03-13
Laurent Goubet
N
o c
h
an
g
es shown wh
e
n the
r
e is an added
S
irius dia
g
ram
commit
|
commitdiff
|
tree
2018-03-13
Laure
n
t Goub
e
t
Memory leak
from
t
he EMFMod
e
lProvide
r
.
co
n
text
T
oRe
s
o
urceMappi
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
Laur
e
nt Goubet
Memo
r
y leaks when
c
om
p
aring Sir
i
us dia
g
rams
commit
|
commitdiff
|
tree
2018-03-13
l
g
oubet
Removing
t
he subversive
inte
g
ration
plugins
commit
|
commitdiff
|
tree
2018-03-13
Laurent Goub
e
t
XMI files are not al
w
ay
s
m
ode
l
s
commit
|
commitdiff
|
tree
2018-03-13
Laure
n
t G
o
ubet
M
e
mory leak during automatic mer
g
e operations from
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
L
aurent Goubet
D
on't return
n
u
ll f
r
om IT
y
ped
E
le
m
en
t
.
getName()
.
commit
|
commitdiff
|
tree
2018-03-12
Laurent Goubet
[532069] Invalid logical mode
l
for Synchronize w
i
th
.
.
.
commit
|
commitdiff
|
tree
2018-02-02
P
h
ilip Langer
Add progress repor
t
ing for post processors
commit
|
commitdiff
|
tree
2018-01-24
Ar
t
hur Daussy
[5
3
0
2
50] Fix Recu
r
siveModelMerger to be ab
l
e to han
d
le
.
.
.
commit
|
commitdiff
|
tree
2017-10-09
Antonio Campesino
[525
5
57] Rigth Ta
v
e
rs
a
l override
with Base
traversal
.
.
.
commit
|
commitdiff
|
tree
2017-10-09
Laurent G
o
ub
e
t
API break in J
G
i
t 4
.
9 d
u
e to the fix for bu
g
517128
commit
|
commitdiff
|
tree
2017-09-08
Al
e
xandra
B
u
z
ila
[513931] Fix Deadlock in StructureMergeViewe
r
commit
|
commitdiff
|
tree
2017-09-08
Laurent
G
oubet
[51
0
4
2
0] Adding missing e
x
ten
s
io
n
p
o
i
n
t
d
efi
n
itions
.
.
.
commit
|
commitdiff
|
tree
2017-09-08
Martin Fleck
[5
1
8957] Reus
e
SemanticUMLContent
P
ro
v
ider instance
.
.
.
commit
|
commitdiff
|
tree
2017-09-08
Philip
Lang
e
r
Avoid NP
E
in Mat
c
hUti
l
and IOOB in
R
eferenceChangeM
e
rg
e
r
commit
|
commitdiff
|
tree
2017-09-08
Phili
p
Langer
[51558
1
] Make test plug-ins available from the update
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
M
a
rtin
F
leck
[5160
6
0] Opaque Acti
o
n
B
ody
conflict resolution results
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
La
u
rent Goubet
[515591] Tr
y
and
fix
random t
e
st f
a
ilures
commit
|
commitdiff
|
tree
2017-09-07
M
a
rtin Fleck
[
5
18572
]
N
a
vigatable should us
e
cont
e
nt provider to
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Mathieu C
a
rtaud
[5187
6
0] Remove legacy JUnit3 artef
a
c
t
s
commit
|
commitdiff
|
tree
2017-09-07
M
artin Fl
e
c
k
[518968] Only tra
v
e
r
s
e an
d
cac
h
e necessary P
a
pyru
s
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Martin Fleck
[518
9
83] CompareInput
A
dapter sh
o
uld cache ancestor
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Martin Fl
e
ck
[
51898
6
] Title of com
p
are editor
s
hou
l
d be computed
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Martin
Fleck
[519003] Ensure
u
ndo/redo is
a
ctivate when SMV has
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Laurent
G
oubet
p
er
f
ormance plugin issues
commit
|
commitdiff
|
tree
2017-09-05
Math
i
eu
Ca
r
t
a
u
d
[4628
6
3] St
a
ging Pro
m
p
t
af
t
er Resolving
Conflicts
commit
|
commitdiff
|
tree
2017-09-05
Mar
t
in
F
leck
[518981] Alw
a
ys use spec
i
alized logi
c
when using RevisionedU
.
.
.
commit
|
commitdiff
|
tree
2017-08-31
Mar
t
in
F
leck
[519025] Only con
s
ider reference
s
w
h
en fi
n
d
i
n
g
stereotyp
e
.
.
.
commit
|
commitdiff
|
tree
2017-08-31
La
u
rent Goubet
[5213
5
8] docum
e
ntation for EM
F
C
o
m
p
areRCPPlu
g
in mi
s
sing
.
.
.
commit
|
commitdiff
|
tree
2017-08-31
Christ
i
an W
.
D
a
m
u
s
[520105] [Tests] M
a
ven executio
n
of Git test
s
fails
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
L
aurent
G
oubet
Bump
i
ng version
s
for Oxygen
.
1
commit
|
commitdiff
|
tree
2017-08-23
Laurent Goubet
R
emoving non
functional pro
f
iles from pom
commit
|
commitdiff
|
tree
2017-08-22
Lauren
t
Goubet
Separate core & extra builds
commit
|
commitdiff
|
tree
2017-07-21
Ma
r
tin Flec
k
R
elax Compare Consi
d
e
rations of I
M
ergeVie
w
erI
t
em
s
commit
|
commitdiff
|
tree
2017-07-20
Philip Langer
Add a few missing
l
i
ce
n
s
e
h
e
a
de
r
s
commit
|
commitdiff
|
tree
2017-07-07
Phili
p
Langer
Refactorings to improve
p
erfo
r
m
ance o
f
M
a
tchUtil
commit
|
commitdiff
|
tree
2017-07-07
Laurent Goubet
[5
1
8612
]
Frequent CME from t
h
e adapt
e
r factory disposal
commit
|
commitdiff
|
tree
2017-07-07
Mart
i
n F
l
eck
[518979] Rem
o
ve
c
onte
x
t ent
r
ies
w
it
h
a
n
empty
cache
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Martin Fleck
[
5
1
9
016
]
Av
o
id
r
e
peated resou
r
ce trave
r
sal when resolving
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Martin Fleck
[519033] Do not re
f
resh
t
he SMV view
e
r after every
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Martin Fl
e
ck
[519023
]
Ch
e
ck cance
l
la
t
i
on less frequ
e
ntly in conflict
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Phi
l
ip
L
anger
[516524]
U
se
more efficient feature
look-up in Ref
e
renceUt
i
l
commit
|
commitdiff
|
tree
2017-07-06
Ch
r
i
s
tia
n
W
.
Damus
[519261
]
[Oomph] Setup model problems fo
r
O
x
ygen
commit
|
commitdiff
|
tree
2017-07-06
Christian W
.
Damus
[519170]
[Checkstyl
e
] Aut
h
or forma
t
constraint is
t
oo
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Christian
W
.
Damu
s
[
51922
7
] [Chec
k
style] Style errors
in
o
ee
.
compare bundle
commit
|
commitdiff
|
tree
2017-07-06
La
u
rent Goube
t
Us
e
the released
v
ersion of EGi
t
commit
|
commitdiff
|
tree
2017-06-29
Antonio Cam
p
esino
B
u
g 518608
-
Dupli
c
ate
d
/ Mi
x
ed Stage not a
l
l
ow
e
d exception
.
.
.
commit
|
commitdiff
|
tree
2017-06-27
Martin Flec
k
[487151]
Acce
p
t
al
l
non-con
f
licting changes fails to
.
.
.
commit
|
commitdiff
|
tree
2017-06-27
Mar
t
i
n Fleck
[514415] Re
l
atio
n
s
hips betwe
e
n diff
s
shou
l
d be cach
e
d
commit
|
commitdiff
|
tree
2017-06-26
Mart
i
n F
l
eck
[
5
1476
7
]
P
rovide
prefer
e
nc
e
s
t
o con
f
igur
e
comparison
.
.
.
commit
|
commitdiff
|
tree
2017-06-26
Martin Fleck
[5
0
7157] Check us
a
ge of InputStreams with mockito
commit
|
commitdiff
|
tree
2017-06-26
Martin Fleck
[
5
12677] Regi
s
te
r
EMFM
o
delProvider for new Pap
y
rus
.
.
.
commit
|
commitdiff
|
tree
2017-06-26
M
a
rti
n
Fleck
[514382] Pre-Merge on conflict can lead to
data loss
commit
|
commitdiff
|
tree
2017-06-26
M
artin Fleck
[514079]
I
mpl
e
m
e
nt Mirroring: Swap left/rig
h
t
s
ide
.
.
.
commit
|
commitdiff
|
tree
2017-06-12
L
a
urent
G
oubet
"spy"ing
i
s the
root cause o
f
a
huge
m
emory
l
e
a
k
commit
|
commitdiff
|
tree
2017-06-06
L
a
u
r
ent Goubet
Revert
"Refactorings to improve pe
r
formance of
Match
U
til"
commit
|
commitdiff
|
tree
2017-06-06
La
u
rent Goubet
Rev
e
rt "Use more
e
f
f
i
cient feature
l
ook-up in Ref
e
renceUtil"
commit
|
commitdiff
|
tree
2017-06-06
P
h
ilip Langer
Update
Oxygen targ
e
t
to
new SysML 1
.
1
update site
commit
|
commitdiff
|
tree
2017-05-12
Philip
Langer
[516508] Cache unresolvable proxie
s
in NotLoad
i
ngResourc
e
Set
commit
|
commitdiff
|
tree
2017-05-12
P
h
i
lip Lang
e
r
[
5
16
5
20] Avoi
d
un
n
e
c
ess
a
ry
not
i
ficatio
n
s of comparison
.
.
.
commit
|
commitdiff
|
tree
2017-05-11
Laurent Goube
t
[516345]
I
nco
n
sistency w
i
th th
e
logica
l
model resolut
i
o
n
commit
|
commitdiff
|
tree
2017-05-11
Laurent Goubet
C
ompat
i
bility with gu
a
va 21
commit
|
commitdiff
|
tree
2017-05-09
Mart
i
n Fl
e
ck
[514079] Default to TextMergeViewer resourc
e
s for ic
o
n
s
.
.
.
commit
|
commitdiff
|
tree
2017-05-09
P
h
il
i
p
L
anger
[509975]
Selection should
b
e
considered f
o
r "next"
.
.
.
commit
|
commitdiff
|
tree
2017-05-09
Laurent
Goubet
[515039] avoid
throw
i
ng
e
x
ceptions during resour
c
e
.
.
.
commit
|
commitdiff
|
tree
next