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
Performance - remove useless guava transformation
2019-08-05
lgoube
t
Perf
o
rmance - remove useless guava
t
r
an
s
format
i
on
commit
|
commitdiff
|
tree
2019-07-17
Chr
i
stian W
.
D
a
mus
[
5
2
2
080] [UML] Add-add conflic
t
s i
n
s
t
ere
o
type application
.
.
.
commit
|
commitdiff
|
tree
2019-07-17
lg
o
ubet
Fix detectio
n
of pseudo conflicts on single-value
d
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgo
u
bet
Regress
i
on on the grou
p
/match right-click ac
t
io
n
s
i
n SMW
commit
|
commitdiff
|
tree
2019-07-16
lgo
u
bet
P
r
operly describ
e
what the co
n
f
l
ict
resolving actions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
M
a
r
tin Fleck
[506928]
Compar
i
sonScopeEdi
t
orInput does not res
p
ect
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
S
tefan Di
r
ix
Cancel Fas
t
er in Pro
x
im
i
tyEObjectMat
c
h
e
r
commit
|
commitdiff
|
tree
2019-07-16
lgou
b
et
A
d
d S
t
ructureMergeViewer
cust
o
m
i
z
ation o
p
t
ions
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Sh
o
rtcu
t
the UMLPo
s
tProcessor's sub
s
et
impli
c
ations
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Axel Rich
a
rd
Ac
t
ivation of
a
l
l Git
t
ests
commit
|
commitdiff
|
tree
2019-07-16
lgo
u
bet
P
revent NPE from ove
r
rid
e
n
R
esource implementati
o
n
s
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Ignore "origina
l
TargetObjects" from the EMF
C
o
mpa
r
e
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgoube
t
Bump versions to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
W
i
llia
m
P
iers
Ena
b
led
"
a
c
c
ept chang
e
" action on multiple diff
selection
commit
|
commitdiff
|
tree
2019-07-04
lg
o
ubet
A
dapt t
e
sts to EG
i
t c
h
ange of behavio
r
commit
|
commitdiff
|
tree
2019-05-29
lgoubet
E
n
able use
r
s
to
merg
e
al
l
c
o
nflicts at once through
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoub
e
t
Merging single-val
u
ed containm
e
nt
changes can
l
ead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgou
b
e
t
Typos
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Preve
n
t
L
C
S com
p
u
tat
i
on w
h
e
n we do no
t
n
eed ordering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgoubet
Pr
e
vent
d
upl
i
c
ate insertion points to b
e
s
hown in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgoubet
P
rev
e
nt C
M
V disposal when us
e
r s
e
l
e
cts multiple e
l
em
e
nts
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgo
u
b
et
Only a
d
d ne
w
adapters wh
e
n n
e
eded
commit
|
commitdiff
|
tree
2019-04-14
lgoubet
I
t
erate
over
the
d
ifferences i
n
stead of the
m
atches
commit
|
commitdiff
|
tree
2019-04-09
lgou
b
e
t
Prevent OutOfMemoryEr
r
o
rs fro
m
the
U
I wh
e
n switching
CM
V
commit
|
commitdiff
|
tree
2019-04-08
lgo
u
bet
Performa
n
c
e - Compu
t
ing requirements t
i
m
e
s
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
The UML tests
shouldn
'
t
use
a
c
ached
i
nstance of EMFCompare
commit
|
commitdiff
|
tree
2019-04-03
lgoube
t
Restore poss
i
b
i
l
ity to
r
emove
m
e
rgers from th
e
registry
commit
|
commitdiff
|
tree
2019-04-01
W
illiam P
i
ers
Fixed ArrayO
u
tOfBound
s
in case of empty lists
commit
|
commitdiff
|
tree
2019-03-22
lgoubet
Make su
r
e we
h
ook the UI when
user
s
provide a precomputed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgoube
t
Bump
E
M
F
Co
m
par
e
t
o
3
.
3
.
7 in preparation for 2019-
0
6
commit
|
commitdiff
|
tree
2019-03-21
lg
o
ube
t
D
i
sposing of the com
p
arison shoul
d
n'
t
be done by
the SMV
commit
|
commitdiff
|
tree
2019-03-04
lgoubet
Avoid C
l
assCastException
w
hen merging f
e
ature map
ch
a
nges
commit
|
commitdiff
|
tree
2019-02-26
lgo
u
b
e
t
Bump versions for 3
.
3
.
6
for 201
9
-03
commit
|
commitdiff
|
tree
2019-02-26
lgoub
e
t
pa
t
c
h
ModelG
i
tMe
r
geEditorInp
u
t
f
or EGit 5
.
3
.
0 compatib
i
lity
commit
|
commitdiff
|
tree
2019-02-26
l
g
oubet
Suppress guava
n
ested concatenations
commit
|
commitdiff
|
tree
2019-02-11
l
g
o
ubet
Remove acc
i
d
e
ntal use o
f
G
uava
commit
|
commitdiff
|
tree
2019-02-11
lgou
b
et
SWTExcept
i
o
n when switchi
n
g
c
o
mparisons in a compar
e
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Allow
c
lie
n
t
s to provi
d
e
p
re-comp
u
ted c
o
mparisons to
.
.
.
commit
|
commitdiff
|
tree
2018-12-11
Philip Langer
[527567] Provide
s
uppor
t
f
o
r
a general pro
p
erty me
r
g
e
.
.
.
commit
|
commitdiff
|
tree
2018-12-11
Philip Lange
r
[514079]
I
m
pro
v
e mir
r
o
ri
n
g
s
upport
commit
|
commitdiff
|
tree
2018-12-04
l
goubet
Ignore failin
g
git tests for
n
ow
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Bu
m
p
ve
r
s
ions to 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Use
a released version of Sirius
commit
|
commitdiff
|
tree
2018-11-30
lgoubet
[
541730] Reverts d59c924 due t
o
an UI
f
reeze
commit
|
commitdiff
|
tree
2018-06-22
lgou
b
et
bump
f
eature
v
ersions
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bump ver
s
ions
commit
|
commitdiff
|
tree
2018-06-22
Sté
p
hane Thiba
u
deau
Extensi
o
n
p
oi
n
t to p
r
o
v
i
d
e
specif
i
c matchin
g
r
u
le
s
.
.
.
commit
|
commitdiff
|
tree
2018-06-22
S
t
épha
n
e Th
i
b
a
udeau
Re
m
o
ve use
l
es
s
and mysterious
code
commit
|
commitdiff
|
tree
2018-06-22
Stéph
a
n
e Thiba
u
deau
EMF C
o
mpare is compatible with J
G
i
t 5
.
* versions
commit
|
commitdiff
|
tree
2018-06-22
Stéph
a
n
e Thiba
u
deau
Ad
d
e
x
pl
i
c
i
t dependency
t
o org
.
ecl
i
p
se
.
gef
commit
|
commitdiff
|
tree
2018-06-22
Stépha
n
e
Thibau
d
eau
Do not minim
i
ze i
d
e
n
tical re
s
o
urces w
h
en Xtext is
used
commit
|
commitdiff
|
tree
2018-06-22
Sté
p
h
a
ne
T
hibau
d
e
a
u
Use white-list
strategy to r
e
trie
v
e the Model provi
d
er
commit
|
commitdiff
|
tree
2018-06-22
Stéphane T
h
iba
u
deau
Better handli
n
g of Xtext with Live scope
o
ption
commit
|
commitdiff
|
tree
2018-06-22
l
g
oubet
EMF Compare is no lon
g
e
r
compatible with
egit <
4
.
2
commit
|
commitdiff
|
tree
2018-06-05
l
g
o
ubet
Introduce
test
for merges with
multiple a
n
cesto
r
s
commit
|
commitdiff
|
tree
2018-06-04
Arthur Daussy
[534365] Fix RecursiveModelMerger fo
r
"binary" git
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
Art
h
u
r Daussy
Do not
handle
"
m
erged" fil
e
s twice when JG
i
t stages
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
Arthur
Daussy
[535
2
00]
C
r
e
ate a new Tr
e
e
W
alk
i
nstead r
e
u
s
i
ng on
e
commit
|
commitdiff
|
tree
2018-05-03
Philip L
a
nger
Improve pe
r
f
o
rma
n
ce of Diff
U
til
commit
|
commitdiff
|
tree
2018-05-03
Phili
p
Langer
I
m
prove performance of
ComparisionUtil
commit
|
commitdiff
|
tree
2018-05-03
Philip Langer
I
mprove
p
erfo
r
mance
o
f
e
quality
help
e
r
commit
|
commitdiff
|
tree
2018-05-01
Christian W
.
Damus
[525473] [Pap
y
r
us]
C
o
nnect
i
ons disapp
e
ar when
c
ompa
r
ing
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Lan
g
e
r
Avoid v
i
sit
i
n
g ele
m
ent
s
multiple t
i
mes in Gr
a
ph
.
P
a
r
entsI
t
e
rator
commit
|
commitdiff
|
tree
2018-05-01
Chr
i
stian W
.
Da
m
us
[5252
8
6] [
P
apy
r
us
]
Diffs in
i
nvisible ster
e
ot
y
pe
pr
o
perty
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Ph
i
li
p
L
a
n
ge
r
[521940] Prevent
in
d
ex out of bou
n
ds exception o
n
empty
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip
L
anger
SWTUtil
.
s
afeRe
d
r
aw should
check fo
r
di
s
p
osed
c
ontro
l
commit
|
commitdiff
|
tree
2018-05-01
Philip La
n
ger
[527567] Generalize the
t
able and tree merg
e
viewer
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Camille
Letavernier
[
5
2
9882] Synchronize
z
o
o
m le
v
el
s
and
a
l
low
changing
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Phil
i
p Lan
g
er
Imp
r
ov
e
p
e
r
formance of
t
he merging process
commit
|
commitdiff
|
tree
2018-05-01
Philip Lange
r
Improve per
f
ormance of I
D
if
f
Rel
a
tionshipC
o
mputer implementat
i
o
n
s
commit
|
commitdiff
|
tree
2018-05-01
Philip Lange
r
Improve pe
r
f
o
rm
a
nce of Abst
r
actC
o
pyCommand
.
g
e
tChangedDiffs
commit
|
commitdiff
|
tree
2018-05-01
P
hilip L
a
nger
[5
2
7864]
Prevent CMV
l
i
nes to be broke
n
a
fter merging
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Phi
l
ip La
n
ger
[
5
27858] Selec
t
i
ng a diff
with con
f
lict
s
fails
commit
|
commitdiff
|
tree
2018-05-01
Philip L
a
nger
[527567] D
i
agramCompare
I
temProviderAdapterF
a
ctory shou
l
d
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip La
n
ger
[508526] Improve text com
p
are
commit
|
commitdiff
|
tree
2018-05-01
P
hilip L
a
nger
The
s
ho
w
merge consequences contro
l
is confus
i
ng when
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Lan
g
er
EMFCo
m
pareStructureMer
g
e
Viewer does much re
d
un
d
ant
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip
Langer
Support
key bindings f
o
r commonly
us
e
d m
e
rge/
n
a
v
igate
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Lan
g
e
r
Impr
o
ve ManyStructuralFeatureAc
c
essorImpl
.
get
D
iffWi
t
hV
a
lue
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
Improv
e
IMerger reg
i
stry
i
m
pl
e
m
e
n
t
ation
commit
|
commitdiff
|
tree
2018-05-01
P
hilip
L
ang
e
r
Improve
p
erformanc
e
of te
x
tual value mat
c
h
i
ng
commit
|
commitdiff
|
tree
2018-04-30
Philip Langer
Im
p
ro
v
e pe
r
fo
r
mance
o
f Comparison
S
pec
commit
|
commitdiff
|
tree
2018-04-30
Phil
i
p Lan
g
er
Avoid expensi
v
e
notifica
t
io
n
s pr
o
cessing after com
p
are
.
.
.
commit
|
commitdiff
|
tree
2018-04-30
Philip Langer
Decrease
progress monitor
i
ng ov
e
r
hea
d
commit
|
commitdiff
|
tree
2018-04-30
Philip Langer
AbstractStructuralFeatureAcc
e
ssor
.
comput
e
Di
f
f
erences
.
.
.
commit
|
commitdiff
|
tree
2018-04-30
Phili
p
Lang
e
r
Cac
h
e
Str
u
ctureMergeVi
e
we
r
Filter results
commit
|
commitdiff
|
tree
2018-04-25
Philip Langer
[522422] Label-based
c
o
n
te
n
t v
i
ew
e
r should
clean
u
p
.
.
.
commit
|
commitdiff
|
tree
2018-04-19
P
h
il
i
p Langer
[52
1
948
]
Support changing the s
t
ate of diffs already
.
.
.
commit
|
commitdiff
|
tree
2018-04-19
Philip Lan
g
er
[516248] Im
p
ro
v
e
N
avig
a
table caching
commit
|
commitdiff
|
tree
2018-04-19
M
artin Fleck
[516248] Actio
n
s
f
or pre
v
ious/next unre
s
o
l
v
e
d
c
hange
commit
|
commitdiff
|
tree
2018-03-19
Lau
r
ent
G
oub
e
t
Pr
o
xy loading
f
rom
th
e
merge to
o
l
commit
|
commitdiff
|
tree
2018-03-16
Laurent Goubet
Allo
w
p
r
o
xy
r
e
solution from the EMF Compare content
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
La
u
r
e
nt Goubet
Al
l
ow proxy
r
esoluti
o
n from
t
he EMF
Compare struct
u
re
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Ph
i
l
i
p Langer
Allow loading ref
e
renced resources aft
e
r th
e
compar
i
so
n
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Lau
r
ent Goub
e
t
SMV
a
ction to
r
eveal all diffe
r
ences in
c
o
nfl
i
ct with
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent Goube
t
Add actions
t
o merge every
t
h
i
n
g to "get righ
t
" o
r
.
.
.
commit
|
commitdiff
|
tree
2018-03-15
Philip
L
anger
[521886] Introduce actio
n
to re
s
olve multiple co
n
flicts
commit
|
commitdiff
|
tree
2018-03-13
Phi
l
ip Lange
r
[521886] Avoid validation
in EMFCo
m
p
a
r
eE
d
i
t
ingDomain
commit
|
commitdiff
|
tree
2018-03-13
Laurent Goube
t
No changes shown when there
is an ad
d
ed Sirius diagram
commit
|
commitdiff
|
tree
2018-03-13
L
a
uren
t
Goubet
Memory leak from the EMFModel
P
rovider
.
contextToResou
r
ceMappi
.
.
.
commit
|
commitdiff
|
tree
next