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 to 3.3.13
2020-11-20
lgoubet
Bump
v
ersion
s
t
o 3
.
3
.
13
commit
|
commitdiff
|
tree
2020-11-19
lgou
b
et
Do
not close the reposito
r
y,
g
etRep
o
sitor
y
Cache()
.
clear
.
.
.
commit
|
commitdiff
|
tree
2020-10-21
l
g
o
u
bet
Allow loading
o
f mo
d
els
u
sing ID attributes for compa
r
ison
commit
|
commitdiff
|
tree
2020-10-21
lgou
b
et
C
o
mpati
b
ili
t
y recent m
o
c
kito
commit
|
commitdiff
|
tree
2020-10-04
lgoubet
O
n
ly consider files we
'
ve extracted as potential test
.
.
.
commit
|
commitdiff
|
tree
2020-08-31
lgoubet
Dele
t
e
sub-pr
o
j
e
c
ts
first when cleaning up
test w
o
rk
s
pace
commit
|
commitdiff
|
tree
2020-07-22
lgoubet
Bu
m
p V
e
rsions to 3
.
3
.
12
commit
|
commitdiff
|
tree
2020-07-22
l
goubet
F
ix name
of 2019-12 target platf
o
rm
commit
|
commitdiff
|
tree
2020-06-26
lgoubet
Fix GitTestSupport
commit
|
commitdiff
|
tree
2020-05-26
lgoubet
Bump v
e
rsio
n
s to 3
.
3
.
1
1
commit
|
commitdiff
|
tree
2020-04-21
lg
o
ubet
Git t
e
st framework faili
n
g on
w
i
ndows
commit
|
commitdiff
|
tree
2020-01-14
lgoubet
Bump update sites to 3
.
3
.
10
commit
|
commitdiff
|
tree
2020-01-14
lgou
b
et
Bump
E
MF Comp
a
r
e
to
3
.
3
.
10 and add 201
9
-12 target pla
t
form
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
Pr
e
v
ent NPE
from the closing of a Comparison Dialog
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
Co
m
pati
b
ility with JGi
t
5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
Potent
i
a
l NPE wh
e
n
s
witching
fil
e
s
in the
c
om
p
are dial
o
g
commit
|
commitdiff
|
tree
2019-11-05
lgou
b
et
S
w
itch
E
MF
C
ompar
e
to Guava 27
commit
|
commitdiff
|
tree
2019-09-25
l
g
o
u
bet
Re-enable signing and tycho-p2-
p
lugin, switch websi
t
e
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lgou
b
et
B
uild testing - dis
a
b
le tycho
-
p2-
p
lugin
commit
|
commitdiff
|
tree
2019-09-25
lgo
u
bet
Bu
i
l
d
te
s
t
ing - dis
a
ble eclipse jarsigne
r
commit
|
commitdiff
|
tree
2019-09-24
l
goubet
E
M
F
Compare do
c
umentati
o
n jar
i
s unsigned
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
R
e
p
lace Guav
a
with Jav
a
8
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Potential race condition when l
o
adi
n
g EPackages for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Potential
N
P
E w
i
th so
m
e
i
mplement
a
tions
of th
e
property
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
S
o
me implementati
o
ns
of Resource
.
Diagnost
i
c may return
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoube
t
EMF
C
ompare does
n
ot
supp
o
rt rela
t
ive xsi:schemaLocation
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoub
e
t
A
P
I comp
a
t
i
bility
commit
|
commitdiff
|
tree
2019-09-18
lgoub
e
t
Remove part of guav
a
us
e
s
commit
|
commitdiff
|
tree
2019-09-18
lg
o
ubet
Bump to 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Ope
n
the c
o
mpa
r
e navigat
a
ble as inte
r
nal API
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Regist
e
r the navigatable so that the tool
b
a
r
actions
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lgo
u
bet
The navigatable's
c
ache needs to be cleared wh
e
n
w
e
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
The
M
atchEngin
e
F
a
c
t
ory does
n
't make use of i
t
s
s
ette
r
s
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
H
appy checkstyle
commit
|
commitdiff
|
tree
2019-09-11
lgoubet
Update
setup file
commit
|
commitdiff
|
tree
2019-09-10
l
goube
t
Target pla
t
f
o
rm based on 2019-06
commit
|
commitdiff
|
tree
2019-09-10
l
goubet
B
e
havior
c
hange in 2019-0
6
- Exceptions are now in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgoubet
R
emove
t
h
e 32
b
it platforms for our targ
e
t confi
g
urations
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Index iss
u
e
when
m
erging non-
u
niqu
e
attributes' elements
commit
|
commitdiff
|
tree
2019-09-06
l
goubet
Diffs dependin
g
on ps
e
udo-co
n
flicts do not reject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
l
goub
e
t
MOVE differences also need to
t
a
ke into
account the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
l
g
oubet
Ina
c
cura
t
e conflict
d
e
tection f
o
r moves in non-containmen
t
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgou
b
et
Moves
w
ith non-uni
q
ue v
a
lues and addition
/
deletions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
l
g
o
ubet
On
l
y MO
V
E diffs need to be ignored when computing the LC
S
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Conflict
d
e
t
ection
on index chan
g
es must take FeatureFil
t
e
r
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Make sure the UI won't try to co
m
p
ute the LCS for huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoub
e
t
The "acce
p
t/reject
"
all non-conflicting action sh
o
u
l
dn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lg
o
ubet
Fix d
i
ff, conflict
d
etection and mer
g
ing of non-unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoubet
Po
t
ential out
o
f bou
n
ds
e
xception
commit
|
commitdiff
|
tree
2019-08-27
lgoubet
Compatibi
l
i
t
y
w
it
h
j
g
it 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgou
b
e
t
Performance
-
u
s
e
DiffCross
R
efer
e
ncer when possible
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
regression - r
i
ght-c
l
i
ck ac
t
ions o
n
s
ingle di
f
f se
l
ecti
o
ns
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Open SM
V
API to
a
llow imple
m
ente
r
s to access
the raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Pre
v
en
t
s e
x
ceptions
f
ro
m
being thrown fr
o
m
th
e
vi
e
wer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
l
goubet
Performance - use streams i
n
stead of guava iter
a
tions
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoube
t
P
e
rfor
m
ance - re
m
ove u
s
eless guava transform
a
tion
commit
|
commitdiff
|
tree
2019-07-17
lgoubet
Fix detectio
n
of pseudo conflicts
on sing
l
e-val
u
ed
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
g
oube
t
Regre
s
sion
o
n the group/
m
atch right-click actions in SM
W
commit
|
commitdiff
|
tree
2019-07-16
l
g
oubet
P
r
operly
de
s
cr
i
be wh
a
t the conflict resolving acti
o
ns
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Add StructureMe
r
g
e
View
e
r cust
o
mization options
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Shortcut the UMLPostProcessor's subset implications
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
goubet
Prevent NPE
f
ro
m
ove
r
riden Resou
r
ce i
m
plementations
commit
|
commitdiff
|
tree
2019-07-16
lgou
b
et
I
gnore
"originalTa
r
g
e
t
O
bjects" from the EMF Comp
a
re
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgoubet
Bu
m
p
versions to
3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgoubet
Ad
a
pt tests
to EGit change of behavior
commit
|
commitdiff
|
tree
2019-05-29
lgoubet
E
nable
users
to me
r
ge all
c
on
f
licts at once th
r
ough
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgou
b
et
Merging sin
g
le-valued
con
t
ainment changes ca
n
l
ead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgo
u
b
e
t
Typos
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
P
revent
L
C
S
c
omputation when we do not need ordering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
l
g
oubet
Prevent d
u
plicat
e
insertion points to be
shown in
t
r
e
e
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
l
g
oubet
Prevent
CMV disposal w
h
en user selec
t
s multiple
e
l
ements
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgou
b
et
Only add
new
adapters when needed
commit
|
commitdiff
|
tree
2019-04-14
lgoubet
Iterat
e
over the differences instead of t
h
e matches
commit
|
commitdiff
|
tree
2019-04-09
lgoubet
Prev
e
nt
O
utOfMemoryErrors from the
UI
w
hen switching CMV
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
Performance - Computing r
e
quirem
e
nts times
commit
|
commitdiff
|
tree
2019-04-08
l
g
oubet
The UML tests shouldn't us
e
a cache
d
instance of EMFCom
p
are
commit
|
commitdiff
|
tree
2019-04-03
lgoubet
Restore possi
b
ility to re
m
ove mergers from the registry
commit
|
commitdiff
|
tree
2019-03-22
lgoubet
Make sure we hook
t
he UI
w
hen users
provide a precomputed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
l
goubet
Bump EMF Compare to 3
.
3
.
7
in
prep
a
rat
i
o
n for 2019-06
commit
|
commitdiff
|
tree
2019-03-21
lgoub
e
t
Disposing of
t
h
e
compariso
n
shouldn't be done
b
y the SMV
commit
|
commitdiff
|
tree
2019-03-04
lgoubet
Avoid ClassC
a
s
tExcepti
o
n
w
hen mer
g
ing
f
eature m
a
p c
h
anges
commit
|
commitdiff
|
tree
2019-02-26
lgou
b
et
Bump versions for
3
.
3
.
6 for 2019-03
commit
|
commitdiff
|
tree
2019-02-26
l
goubet
patch ModelGitMergeE
d
itorI
n
put
for EGit
5
.
3
.
0 compatibility
commit
|
commitdiff
|
tree
2019-02-26
lgou
b
e
t
Suppress guava ne
s
ted
concatenations
commit
|
commitdiff
|
tree
2019-02-11
lgo
u
bet
Remove accident
a
l use
o
f G
u
ava
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
SWTExcep
t
ion
whe
n
switching comparisons in a c
o
mp
a
re
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Allow clients
t
o
p
rovi
d
e pre
-
computed comparisons to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
lgoubet
Igno
r
e
failing git
tests for
now
commit
|
commitdiff
|
tree
2018-12-03
lgoube
t
Bu
m
p versions to 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Use a
r
eleased versi
o
n of Sirius
commit
|
commitdiff
|
tree
2018-11-30
lgou
b
et
[54
1
7
3
0
]
Reverts
d
59c
9
24 due to an UI
freeze
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
b
u
mp
f
eature versions
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
b
um
p
versi
o
ns
commit
|
commitdiff
|
tree
2018-06-22
l
goub
e
t
E
M
F
C
o
mpare is
n
o
lo
n
ger
c
ompa
t
i
b
le with egit < 4
.
2
commit
|
commitdiff
|
tree
2018-06-05
l
g
oubet
I
n
troduce test for merge
s
with
m
u
l
tip
l
e ancestors
commit
|
commitdiff
|
tree
2018-03-19
Laur
e
nt Go
u
b
e
t
P
roxy l
o
ading
f
rom the merge too
l
commit
|
commitdiff
|
tree
2018-03-16
Laurent Goubet
Allow proxy resolutio
n
from the E
M
F Compare content
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent Goubet
A
l
l
ow pr
o
xy reso
l
uti
o
n from th
e
EMF Compare structure
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
L
aurent Goubet
S
MV ac
t
ion
to reveal all diff
e
rences in conflict with
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Lauren
t
Goubet
Add actions to merge
everything to
"get righ
t
" or
.
.
.
commit
|
commitdiff
|
tree
next