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
Make sure folders are created when extracting input files
2020-11-24
lgo
u
bet
Make s
u
re fol
d
ers are created w
h
en
extractin
g
input
.
.
.
commit
|
commitdiff
|
tree
2020-11-20
lgoubet
Bu
m
p
vers
i
ons to 3
.
3
.
13
commit
|
commitdiff
|
tree
2020-11-19
lg
o
ubet
Do no
t
close the repo
s
itory, getRepo
s
itoryCache()
.
clea
r
.
.
.
commit
|
commitdiff
|
tree
2020-10-21
l
g
oubet
A
llow loading of mo
d
els
u
sing ID attr
i
bute
s
fo
r
comparison
commit
|
commitdiff
|
tree
2020-10-21
lg
o
ubet
Compatibili
t
y recent
m
ockito
commit
|
commitdiff
|
tree
2020-10-04
lgo
u
bet
O
n
l
y
consider fil
e
s we've extr
a
c
t
ed as potentia
l
tes
t
.
.
.
commit
|
commitdiff
|
tree
2020-08-31
lgoubet
D
elete sub-projects
f
irst
when cleaning
u
p test workspace
commit
|
commitdiff
|
tree
2020-07-22
lg
o
ubet
B
u
mp Versions to 3
.
3
.
12
commit
|
commitdiff
|
tree
2020-07-22
lgoubet
Fix name of
2
019-12
t
a
r
g
et platfor
m
commit
|
commitdiff
|
tree
2020-06-26
lgoubet
F
ix G
i
tTestSupport
commit
|
commitdiff
|
tree
2020-05-26
lgoubet
Bu
m
p versions to
3
.
3
.
11
commit
|
commitdiff
|
tree
2020-04-21
lgoubet
Git test f
r
a
m
ew
o
rk
f
a
iling on window
s
commit
|
commitdiff
|
tree
2020-01-14
l
g
oub
e
t
B
ump update
sites to 3
.
3
.
10
commit
|
commitdiff
|
tree
2020-01-14
lgoubet
Bu
m
p EMF Compare to 3
.
3
.
10 and
a
dd 2019-1
2
target platform
commit
|
commitdiff
|
tree
2020-01-06
l
goubet
Prevent NPE
f
rom the closing of a Comparison Dialog
commit
|
commitdiff
|
tree
2020-01-06
lgou
b
et
C
o
mpatibility with JGit 5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lgo
u
bet
Potential NPE wh
e
n s
w
itchi
n
g files in t
h
e compar
e
d
i
a
log
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
Swi
t
ch EMF Compare to Guava
2
7
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
R
e
-enable signing a
n
d
tycho-p2-plugin, swi
t
ch
w
ebsite
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
l
g
oubet
Build
t
e
sti
n
g
-
disable tyc
h
o-p2-plugin
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Build
test
i
ng - disab
l
e
e
c
lipse j
a
rsigner
commit
|
commitdiff
|
tree
2019-09-24
lgo
u
bet
EMF Com
p
are documentatio
n
jar is un
s
igned
commit
|
commitdiff
|
tree
2019-09-19
lgou
b
et
Replace Gu
a
va with Java 8
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Po
t
e
ntial rac
e
con
d
ition w
h
en
l
oading EPackage
s
for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Potential NPE with some
imp
l
ementations of the property
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
S
o
m
e
imp
l
emen
t
ations
of Resource
.
Diagn
o
stic may return
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgou
b
e
t
E
MF Compare does not support rela
t
iv
e
xsi:schemaLocation
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
l
g
oubet
API
compatibility
commit
|
commitdiff
|
tree
2019-09-18
l
goube
t
Rem
o
ve part of guava uses
commit
|
commitdiff
|
tree
2019-09-18
l
goubet
Bump to 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lgoube
t
O
p
en
t
h
e
compare navigatabl
e
a
s
inte
r
na
l
API
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Register th
e
navigatable so
t
h
a
t
t
he toolb
a
r actions
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lgoubet
The naviga
t
able's
cac
h
e nee
d
s to
b
e
c
leared when we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lgou
b
et
The Mat
c
hEn
g
ineFac
t
ory d
o
esn't
make us
e
of its
s
e
tters
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
H
a
ppy
checkst
y
le
commit
|
commitdiff
|
tree
2019-09-11
lgoubet
Update setup file
commit
|
commitdiff
|
tree
2019-09-10
lgoub
e
t
T
arge
t
platform based on 201
9
-0
6
commit
|
commitdiff
|
tree
2019-09-10
l
g
oubet
B
e
havior chan
g
e
i
n
201
9
-06 - Except
i
o
n
s
a
r
e
n
ow in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgoubet
Remove the 32 bi
t
platfo
r
ms for
o
u
r target configur
a
tions
commit
|
commitdiff
|
tree
2019-09-06
lgoube
t
I
n
d
e
x iss
u
e
w
h
e
n merging no
n
-unique
attributes' elements
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Diffs depending on pseud
o
-co
n
fl
i
cts do
n
ot reject th
e
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
MOVE differences also
need to take into a
c
count the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Inaccurate con
f
lict detection for moves in non
-
containment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Moves with non-
u
niq
u
e
va
l
ues and addition
/
deletion
s
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
O
nly MO
V
E diffs need to
b
e ignor
e
d when c
o
mputing the LCS
commit
|
commitdiff
|
tree
2019-09-04
lgou
b
et
Conflict
d
etection on inde
x
change
s
mus
t
take
F
eatureFi
l
ter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Make sure the UI wo
n
't try to c
o
mpute the
L
CS
f
or huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
The "ac
c
ept/reject" a
l
l no
n
-con
f
l
i
cting acti
o
n s
h
ouldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
l
g
oube
t
Fix diff, conflict detection
and merging of non
-
u
n
ique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
l
g
oubet
Potential out
o
f b
o
unds exc
e
ptio
n
commit
|
commitdiff
|
tree
2019-08-27
lgoubet
Compatibil
i
ty
with jgit 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
Performance - use D
i
ffCrossR
e
f
e
rencer when
p
o
ssible
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
regression - righ
t
-click acti
o
n
s
o
n single d
i
ff selections
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Open S
M
V
API
to
a
l
low implem
e
nt
e
rs to acc
e
s
s
the raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
P
revents exceptions f
r
o
m
being thrown from the vie
w
er
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoube
t
Performanc
e
- use streams i
n
stead of guava iterations
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
l
g
oubet
P
erfo
r
mance - remov
e
useless
g
uava
t
r
ansformati
o
n
commit
|
commitdiff
|
tree
2019-07-17
lgoub
e
t
Fix d
e
tection of
pseudo co
n
flicts on sin
g
le-value
d
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Regr
e
ssion on the group/match r
i
ght-click actions in SMW
commit
|
commitdiff
|
tree
2019-07-16
l
goubet
Pro
p
erly describe what the confl
i
ct
resolving ac
t
ions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Add Struc
t
ure
M
erge
V
iewe
r
customization options
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Shortcut the UML
P
ostProcessor's subse
t
implicati
o
ns
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgo
u
be
t
Prev
e
nt NPE from overriden Reso
u
rce imp
l
emen
t
at
i
ons
commit
|
commitdiff
|
tree
2019-07-16
lgo
u
bet
Ig
n
o
r
e
"orig
i
nalTa
r
getObjects" f
r
o
m
th
e
EMF Compa
r
e
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgoubet
Bump versions to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgoubet
Adapt tests to EGit change of be
h
avior
commit
|
commitdiff
|
tree
2019-05-29
lgoubet
E
nable users
t
o
m
e
rge all
c
o
nflicts at on
c
e th
r
ough
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
l
g
oube
t
M
erging single-v
a
lued containment ch
a
nges can lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Typ
o
s
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Prev
e
nt LCS compu
t
ation wh
e
n
we
do not need ordering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgoubet
Prevent duplicate inser
t
i
on
p
o
ints
t
o be sh
o
wn in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgoubet
P
r
e
ven
t
CMV disposal whe
n
user selec
t
s mult
i
ple elemen
t
s
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgou
b
et
Only add new ad
a
p
ters wh
e
n need
e
d
commit
|
commitdiff
|
tree
2019-04-14
lgoubet
It
e
ra
t
e o
v
er t
h
e d
i
ffe
r
en
c
es instead
o
f the
m
atches
commit
|
commitdiff
|
tree
2019-04-09
lgoubet
Preve
n
t OutOfMemor
y
Errors from th
e
U
I
w
he
n
switc
h
ing CMV
commit
|
commitdiff
|
tree
2019-04-08
lgoub
e
t
Pe
r
fo
r
mance
- Comput
i
ng
req
u
irements times
commit
|
commitdiff
|
tree
2019-04-08
lgoube
t
The UM
L
tests shouldn't use a cac
h
ed
i
nstance of EMFCo
m
p
a
r
e
commit
|
commitdiff
|
tree
2019-04-03
l
g
oub
e
t
Restore p
o
ssibilit
y
to r
e
m
ove mergers from the reg
i
stry
commit
|
commitdiff
|
tree
2019-03-22
l
goubet
Make sure we
hook the UI when users provide a precomputed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgoub
e
t
Bump
E
MF Compare to 3
.
3
.
7
in preparation for 2019
-
06
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Disposing
o
f the com
p
arison shouldn
'
t be done by t
h
e
S
MV
commit
|
commitdiff
|
tree
2019-03-04
lgoubet
Avoi
d
ClassCa
s
tE
x
cep
t
io
n
whe
n
merging fe
a
ture ma
p
cha
n
ges
commit
|
commitdiff
|
tree
2019-02-26
lgoube
t
B
u
mp ve
r
sions
for 3
.
3
.
6 for 2019-03
commit
|
commitdiff
|
tree
2019-02-26
l
g
oubet
patch Mo
d
e
l
GitMergeEditorInput for EGit
5
.
3
.
0 compatibility
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
S
u
ppress guava
n
ested
c
onc
a
tenations
commit
|
commitdiff
|
tree
2019-02-11
l
g
o
ubet
Remov
e
accidental use of Guava
commit
|
commitdiff
|
tree
2019-02-11
lgo
u
bet
SWTExc
e
ption when
s
witching comparisons in a c
o
mpare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
l
g
oubet
Allow clients to prov
i
de pre-co
m
puted
c
ompari
s
o
ns to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
lgoubet
Ignor
e
failing git test
s
for
n
ow
commit
|
commitdiff
|
tree
2018-12-03
lg
o
u
b
et
Bu
m
p
v
ersions to 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Use a releas
e
d v
e
rsion of Si
r
ius
commit
|
commitdiff
|
tree
2018-11-30
lgoubet
[541730] Reverts d5
9
c924 due to a
n
UI
freeze
commit
|
commitdiff
|
tree
2018-06-22
lgoube
t
bump feature ve
r
sion
s
commit
|
commitdiff
|
tree
2018-06-22
lgoub
e
t
bump versi
o
ns
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
EMF Compare is no longer compatible with
e
git < 4
.
2
commit
|
commitdiff
|
tree
2018-06-05
lgoubet
Introduce test
for
merges
w
i
th multiple ances
t
ors
commit
|
commitdiff
|
tree
2018-03-19
L
a
urent Goube
t
Prox
y
loading from the merg
e
tool
commit
|
commitdiff
|
tree
2018-03-16
Laurent Goubet
Allow proxy resolution from
the
E
M
F Compa
r
e
c
ontent
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laur
e
nt Goube
t
Allow proxy resolution from t
h
e EMF
Compar
e
structure
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent
Goub
e
t
SMV action to rev
e
al all di
f
ferences
in conflict with
.
.
.
commit
|
commitdiff
|
tree
next