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
[doc] update User Guide: Change download page link.
2020-01-14
lgoubet
B
u
mp
update sites
t
o 3
.
3
.
10
commit
|
commitdiff
|
tree
2020-01-14
lgoubet
Bump E
M
F Compare t
o
3
.
3
.
10 and
a
d
d
201
9
-12 target platform
commit
|
commitdiff
|
tree
2020-01-06
l
go
u
bet
Prevent NPE from t
h
e
c
losi
n
g of
a
Compari
s
on Dialog
commit
|
commitdiff
|
tree
2020-01-06
lgoube
t
Compat
i
bility with JGit
5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lgou
b
et
P
ote
n
tial NPE when
switching file
s
in th
e
compare dialog
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
Switch E
M
F Com
p
are t
o
Guava 2
7
commit
|
commitdiff
|
tree
2019-09-25
lgou
b
e
t
Re
-
enable signing and tycho
-
p
2-plugin
,
switch website
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Build testin
g
-
disable tycho
-
p2-plug
i
n
commit
|
commitdiff
|
tree
2019-09-25
l
g
o
ubet
Build test
i
n
g - disable ec
l
ipse jars
i
gner
commit
|
commitdiff
|
tree
2019-09-24
lgoube
t
E
M
F Compar
e
documentation jar is unsigned
commit
|
commitdiff
|
tree
2019-09-19
lgo
u
bet
Replace Guava with Java 8
commit
|
commitdiff
|
tree
2019-09-19
lgo
u
bet
Potential race condition when loa
d
in
g
EPack
a
g
es for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
P
o
tent
i
al NPE with
some
i
mp
l
e
men
t
ations of t
h
e property
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoube
t
S
o
me implementations of Resource
.
Di
a
g
nostic may return
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgou
b
et
EMF
C
ompare
does not support
r
elati
v
e xs
i
:schemaLo
c
ation
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
API co
m
pat
i
bility
commit
|
commitdiff
|
tree
2019-09-18
lgo
u
bet
Remov
e
part of guava uses
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Bump to 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Op
e
n the compare navigatabl
e
as interna
l
A
P
I
commit
|
commitdiff
|
tree
2019-09-18
l
goub
e
t
Regis
t
er the navigata
b
le so that the toolba
r
actions
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
l
g
oubet
The navigatable's cac
h
e needs to be cle
a
red when we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
The
M
atch
E
ngineFacto
r
y doesn'
t
make use of its setters
commit
|
commitdiff
|
tree
2019-09-16
l
g
oubet
Happy chec
k
style
commit
|
commitdiff
|
tree
2019-09-11
lgou
b
et
Up
d
ate setup file
commit
|
commitdiff
|
tree
2019-09-10
l
goubet
Ta
r
ge
t
platform ba
s
ed on 2019-06
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Beh
a
v
ior cha
n
ge in 2019-
0
6
-
E
x
c
eptio
n
s are
now
in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
l
goubet
R
emov
e
the 32
bit platforms for
o
ur target configura
t
ions
commit
|
commitdiff
|
tree
2019-09-06
lg
o
ubet
Index issue when
m
e
rg
i
ng non-unique
a
t
tribut
e
s
' el
e
ments
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Diffs depending on pse
u
do-conf
l
icts do not
r
eject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
MO
V
E differences also
n
eed to t
a
ke into acc
o
unt the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
I
n
accurate
conflict dete
c
tion fo
r
moves i
n
non
-
co
n
tainm
e
nt
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Mov
e
s with non-unique values and ad
d
i
ti
o
n/deletions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lg
o
ubet
Only M
O
VE diffs need
t
o
be ignored w
h
en
comp
u
tin
g
the LCS
commit
|
commitdiff
|
tree
2019-09-04
lgoube
t
Confl
i
ct detection o
n
index
c
hanges
must take FeatureFilter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lg
o
ubet
Make sur
e
the UI won't try t
o
compute
the L
C
S for huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
l
g
oubet
The "ac
c
ept/reject" all no
n
-confl
i
cti
n
g action shouldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
Fix dif
f
, conflict detection
an
d
merging of non-
u
nique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoubet
Potent
i
al out of bounds exce
p
tion
commit
|
commitdiff
|
tree
2019-08-27
lgo
u
bet
Compatibility wi
t
h jgit
5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
Performan
c
e - use DiffCrossRe
f
erence
r
when
possible
commit
|
commitdiff
|
tree
2019-08-22
lgoub
e
t
regressi
o
n - right-
c
lick actions on
s
ingle di
f
f
selections
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Open SMV API to all
o
w implementer
s
t
o access the raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoube
t
Preven
t
s ex
c
eptions
fro
m
be
i
ng thrown from th
e
vi
e
w
er
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
Performanc
e
-
use streams
instead of
g
u
a
v
a iterations
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgou
b
et
Performance
-
remov
e
useless guava transformati
o
n
commit
|
commitdiff
|
tree
2019-07-17
l
g
oub
e
t
Fi
x
d
e
tect
i
on of ps
e
ud
o
conflicts
on single-valued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
goubet
R
e
gression on
t
he group/match r
i
ght-click
actions in SM
W
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Properly
d
e
s
cribe w
h
a
t
th
e
conflict resolving actions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
Add S
t
ructureMe
r
ge
V
ie
w
er customizatio
n
options
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
Shortcu
t
the
UMLPostProc
e
ssor's subset implications
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
goubet
Pre
v
e
n
t NP
E
f
rom overriden Resource implementations
commit
|
commitdiff
|
tree
2019-07-16
lgo
u
bet
Ignore "originalTar
g
et
O
bjec
t
s"
from the EMF Compare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgo
u
bet
Bu
m
p versi
o
ns to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lg
o
ubet
A
d
apt tests to EGit c
h
an
g
e
of b
e
ha
v
io
r
commit
|
commitdiff
|
tree
2019-05-29
lgoubet
E
n
able
u
sers to merg
e
all conflic
t
s
at once
t
hroug
h
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Merging s
i
ngle
-
valued contai
n
ment chan
g
es can lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgo
u
bet
Typos
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
P
revent
L
CS computa
t
ion when we do not need
orderin
g
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgoube
t
P
r
eve
n
t duplica
t
e inser
t
ion points to be shown in tr
e
e
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgoubet
P
r
e
v
ent CMV disposal w
h
en user selec
t
s multiple elements
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgoubet
On
l
y
a
dd
ne
w
a
d
a
pt
e
rs when need
e
d
commit
|
commitdiff
|
tree
2019-04-14
lgou
b
et
I
terate over the differe
n
ces
instead of the matches
commit
|
commitdiff
|
tree
2019-04-09
lg
o
ub
e
t
Prev
e
n
t
OutOfMem
o
ryEr
r
or
s
from the
UI whe
n
switching CMV
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
Per
f
ormance - C
o
mputing re
q
uireme
n
ts times
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
The UML tests
shouldn't use
a
cached
i
nstance of
E
MFComp
a
re
commit
|
commitdiff
|
tree
2019-04-03
lgoube
t
R
e
s
to
r
e possibility to remo
v
e mer
g
ers f
r
om the registry
commit
|
commitdiff
|
tree
2019-03-22
lgou
b
et
Make sur
e
w
e
hoo
k
the UI
whe
n
users provide a precomputed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Bump EMF Comp
a
re to 3
.
3
.
7
i
n
pre
p
a
r
atio
n
f
or
2019-
0
6
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Dispo
s
ing o
f
the
comp
a
rison sho
u
l
dn't be done by t
h
e SMV
commit
|
commitdiff
|
tree
2019-03-04
lgoubet
Avoid Clas
s
CastException when merging feature map chan
g
es
commit
|
commitdiff
|
tree
2019-02-26
lgoub
e
t
Bu
m
p versi
o
ns for 3
.
3
.
6 for 2
0
19-
0
3
commit
|
commitdiff
|
tree
2019-02-26
lgo
u
bet
p
a
tch ModelGitMer
g
eE
d
itorInput for
E
G
it 5
.
3
.
0 compatibility
commit
|
commitdiff
|
tree
2019-02-26
lgoub
e
t
Suppr
e
ss gu
a
v
a
ne
s
ted concatenations
commit
|
commitdiff
|
tree
2019-02-11
l
g
oubet
Remove accidental use of Guava
commit
|
commitdiff
|
tree
2019-02-11
lg
o
ub
e
t
S
WTE
x
ce
p
tion
w
hen switching comparisons in
a
compare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgou
b
et
Allow
clients to provide pre-computed comparisons to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
lgou
b
et
Ignor
e
fai
l
ing git
tests for now
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
B
ump
v
ersions 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] Re
v
ert
s
d59c924 due to an
UI
freeze
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bump feature versions
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bum
p
ver
s
i
o
ns
commit
|
commitdiff
|
tree
2018-06-22
lgoub
e
t
EM
F
Compare is no lon
g
er compatible with
e
git <
4
.
2
commit
|
commitdiff
|
tree
2018-06-05
l
g
o
ubet
Introduce t
e
st
f
or merg
e
s wi
t
h multiple
ance
s
to
r
s
commit
|
commitdiff
|
tree
2018-03-19
Laurent Goubet
Proxy loading from the
merge
too
l
commit
|
commitdiff
|
tree
2018-03-16
Laurent Gou
b
et
Allow pr
o
xy resolution from the EMF Compare content
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Lau
r
ent Goub
e
t
Allow p
r
oxy reso
l
ution from the EM
F
Compare
s
tructure
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Lauren
t
Goubet
S
M
V action to
r
eveal
a
ll differences in conflict with
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
La
u
rent Go
u
bet
Add
a
ctions to merge ever
y
t
h
ing to "get right"
o
r
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
L
aure
n
t Goubet
No ch
a
nges
s
hown
w
hen
t
here is an
a
d
ded
Sirius diag
r
am
commit
|
commitdiff
|
tree
2018-03-13
Laure
n
t
Goubet
Memor
y
l
ea
k
from
t
he EMFModelP
r
ovide
r
.
contextToR
e
sourceMappi
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
Laurent Go
u
bet
Memory leaks when compari
n
g Sirius diagrams
commit
|
commitdiff
|
tree
2018-03-13
lgoubet
Removing the
s
ubversive integration plugins
commit
|
commitdiff
|
tree
2018-03-13
L
a
urent G
o
u
bet
XMI
f
iles
are
not always
m
ode
l
s
commit
|
commitdiff
|
tree
2018-03-13
La
u
r
e
nt Goubet
Memory leak during
automat
i
c
merge operation
s
from
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
L
aur
e
nt G
o
ubet
Don't return null from
I
T
ypedEleme
n
t
.
ge
t
Name()
.
commit
|
commitdiff
|
tree
2018-03-12
Laurent
G
oubet
[5
3
2069] I
n
valid
logical model for S
y
nchronize with
.
.
.
commit
|
commitdiff
|
tree
2018-01-30
l
g
oubet
Bu
m
p
plug
i
n and
f
e
a
ture ve
r
si
o
n
s
fo
r
Ph
o
ton
commit
|
commitdiff
|
tree
2018-01-24
lgoubet
Removing the Papyrus plugins and
f
eatures
from the
.
.
.
commit
|
commitdiff
|
tree
2017-10-09
Laurent
Goube
t
API break in J
G
it 4
.
9
due to
t
he fix f
o
r
bug 5171
2
8
commit
|
commitdiff
|
tree
next