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
lgoub
e
t
Mak
e
sure
f
olde
r
s are created when extra
c
tin
g
inp
u
t
.
.
.
commit
|
commitdiff
|
tree
2020-11-20
lgoubet
Bump versi
o
ns to 3
.
3
.
13
commit
|
commitdiff
|
tree
2020-11-19
lgoubet
Do
n
ot
c
lo
s
e the
repository, getRepo
s
i
t
oryCache()
.
clear
.
.
.
commit
|
commitdiff
|
tree
2020-10-21
lgoubet
Allow loading of models using ID attributes
f
or compa
r
i
s
on
commit
|
commitdiff
|
tree
2020-10-21
lgoube
t
Co
m
pa
t
i
b
i
l
i
t
y r
e
cent mockito
commit
|
commitdiff
|
tree
2020-10-04
lg
o
ube
t
O
n
ly cons
i
der files
w
e
'
ve extracted a
s
po
t
ential test
.
.
.
commit
|
commitdiff
|
tree
2020-08-31
lgoubet
D
e
lete sub-projects first when cl
e
aning u
p
test workspace
commit
|
commitdiff
|
tree
2020-07-22
l
gou
b
et
Bump Versions
t
o 3
.
3
.
12
commit
|
commitdiff
|
tree
2020-07-22
l
goube
t
Fi
x
name
o
f
2019
-
1
2 tar
g
et platf
o
r
m
commit
|
commitdiff
|
tree
2020-06-26
lgoubet
Fix GitTestSupport
commit
|
commitdiff
|
tree
2020-05-26
l
goubet
Bump
v
ersi
o
ns to 3
.
3
.
1
1
commit
|
commitdiff
|
tree
2020-04-21
lgo
u
b
e
t
Git t
e
st f
r
a
m
ework failing on wi
n
d
o
ws
commit
|
commitdiff
|
tree
2020-01-14
lgoubet
Bump update sites to
3
.
3
.
1
0
commit
|
commitdiff
|
tree
2020-01-14
l
gou
b
et
Bump EMF Compar
e
to 3
.
3
.
10 and add 2019-12 tar
g
et pla
t
f
o
r
m
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
Pr
e
vent NPE
f
rom the cl
o
sing
of a Comparison Di
a
log
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
C
o
m
p
atibility with JGit 5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
Potential
N
PE
w
hen
swit
c
hing files in the compare dialog
commit
|
commitdiff
|
tree
2019-11-05
l
goubet
Sw
i
tch EMF Co
m
pare to Guava 27
commit
|
commitdiff
|
tree
2019-09-25
lgo
u
bet
Re-enable signing and tych
o
-p2-plugin, switch web
s
i
t
e
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lg
o
ubet
Build testi
n
g - disable tycho-p2-plugin
commit
|
commitdiff
|
tree
2019-09-25
l
goubet
Build testing - d
i
s
a
ble eclipse jarsigner
commit
|
commitdiff
|
tree
2019-09-24
lgoubet
EMF Compare
d
ocum
e
ntation jar is
u
ns
i
gn
e
d
commit
|
commitdiff
|
tree
2019-09-19
lg
o
ubet
Replace Guava
wi
t
h Ja
v
a
8
commit
|
commitdiff
|
tree
2019-09-19
lgoub
e
t
Potential race
c
o
ndition
w
hen load
i
ng EPa
c
kages
f
o
r
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoub
e
t
P
o
tentia
l
N
PE with some
implement
a
t
i
ons of the property
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoube
t
Some i
m
plementatio
n
s of Resource
.
D
i
a
gn
o
stic may return
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
l
goubet
EMF Compare does not support relati
v
e
xsi:s
c
h
e
m
aLocat
i
on
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgou
b
e
t
API compa
t
ibili
t
y
commit
|
commitdiff
|
tree
2019-09-18
lgou
b
e
t
Remove part of
guava uses
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Bump t
o
3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
l
g
oubet
Open t
h
e
compare navigatable as internal
A
PI
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Regis
t
er the na
v
igatable so tha
t
t
he toolba
r
a
c
tions
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lgoubet
The n
a
vi
g
at
a
b
l
e
'
s
cache needs to be cleared when we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
The Mat
c
hEng
i
neFactory doesn't
m
a
k
e use of its s
e
tters
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
Happ
y
checkstyle
commit
|
commitdiff
|
tree
2019-09-11
lgoubet
Update setup file
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Tar
g
et platform based on 2019-06
commit
|
commitdiff
|
tree
2019-09-10
lgo
u
b
e
t
Behavior chan
g
e in
2
019-
0
6 -
Exceptions are now in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgo
u
bet
Remove the 32 bit
platfo
r
m
s
for our
target conf
i
g
ura
t
ions
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Index
i
ssue whe
n
mer
g
ing non-un
i
que attributes' elements
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Dif
f
s de
p
ending
o
n pseudo-conf
l
icts d
o
not reject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgou
b
et
MOV
E
d
ifferences
a
lso need t
o
take into accoun
t
the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgo
u
bet
Inaccura
t
e confli
c
t
detect
i
on for moves in non-containment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Mov
e
s with n
o
n
-un
i
que values and addi
t
ion/
d
eletion
s
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgou
b
et
On
l
y MOVE diffs ne
e
d to be ignored when compu
t
ing the LC
S
commit
|
commitdiff
|
tree
2019-09-04
lgoube
t
Confli
c
t
d
ete
c
tion
on index ch
a
nges m
u
st t
a
ke FeatureFilt
e
r
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Make sure th
e
UI won'
t
t
r
y to co
m
put
e
the LCS
f
or huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
Th
e
"
a
ccep
t
/r
e
ject" all non-conflicting ac
t
ion s
h
oul
d
n
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
Fi
x
diff, conflic
t
detection and mergin
g
of non-u
n
ique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoubet
Poten
t
ial out of bounds
e
xception
commit
|
commitdiff
|
tree
2019-08-27
lgo
u
be
t
C
o
m
p
atibility with
j
git 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
P
e
r
f
ormance
-
use DiffCrossR
e
ferencer whe
n
possible
commit
|
commitdiff
|
tree
2019-08-22
lgou
b
et
regr
e
ssion - right-cl
i
ck acti
o
ns on single d
i
f
f selections
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
l
goubet
Open SMV A
P
I to
a
llow im
p
lementers to acces
s
th
e
raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Prevents exceptio
n
s
from
b
e
ing th
r
own from the viewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
l
g
oubet
Performance
-
use st
r
eam
s
inst
e
ad of gu
a
va ite
r
a
tions
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lg
o
u
bet
Performa
n
ce
-
remove u
s
eless guava
t
ransfo
r
m
ation
commit
|
commitdiff
|
tree
2019-07-17
lgou
b
et
Fix detection of pseudo conflicts on single-
v
alued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Regression o
n
the group/match right-click actions in SMW
commit
|
commitdiff
|
tree
2019-07-16
lgo
u
bet
Prop
e
r
ly describe w
h
at the conflict resolving actions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
goubet
Add StructureMergeVi
e
wer
customizat
i
o
n
opt
i
ons
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
S
h
o
rtc
u
t th
e
U
MLPostProce
s
so
r
's subset
i
mplication
s
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lg
o
u
bet
Prevent NPE fro
m
overriden Resource imple
m
entat
i
ons
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
I
g
nore "o
r
i
g
i
n
a
lT
a
rgetObj
e
cts" from the EMF C
o
mpare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
l
g
o
u
bet
B
u
m
p
v
e
r
s
i
ons to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgoubet
A
d
apt tests
t
o EGit cha
n
ge of behavior
commit
|
commitdiff
|
tree
2019-05-29
lgou
b
et
Enable users
t
o
merge all conflicts at once through
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgou
b
et
Me
r
gin
g
single-valued
containment changes can l
e
a
d
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Typos
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
P
revent LCS
computation when we do not need orde
r
ing
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
l
goub
e
t
Prev
e
nt
dup
l
icate
inse
r
t
ion points to be shown in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgoubet
P
r
event CMV di
s
posal w
h
e
n
user selects multi
p
le elements
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgoubet
O
nly add new adapters when needed
commit
|
commitdiff
|
tree
2019-04-14
lgoube
t
Iterate
o
ver the differences in
s
tead of
t
h
e
mat
c
hes
commit
|
commitdiff
|
tree
2019-04-09
lgo
u
bet
P
r
event OutO
f
MemoryErrors from the UI when switchin
g
CMV
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
Performanc
e
-
Compu
t
ing requirements
t
imes
commit
|
commitdiff
|
tree
2019-04-08
lgoub
e
t
The UML tests shouldn't
u
se
a
cached i
n
stance of EMFCompare
commit
|
commitdiff
|
tree
2019-04-03
l
gou
b
et
Restore possi
b
ility to remove mergers from the r
e
gistr
y
commit
|
commitdiff
|
tree
2019-03-22
l
goubet
M
a
ke sur
e
w
e hook the UI when users pro
v
ide a
p
recomputed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgoub
e
t
Bump EMF Com
p
are to
3
.
3
.
7 in pr
e
paration for 20
1
9-06
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Disposing of the com
p
ariso
n
sho
u
ldn'
t
be done by t
h
e
S
M
V
commit
|
commitdiff
|
tree
2019-03-04
lgo
u
bet
Avoid ClassCastException w
h
en
m
erging fea
t
ure map cha
n
ges
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Bump ve
r
sions for
3
.
3
.
6
f
o
r
2019-03
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
patch ModelGit
M
ergeEditorInput for EGit 5
.
3
.
0 compati
b
i
l
i
ty
commit
|
commitdiff
|
tree
2019-02-26
l
g
o
u
bet
Suppress g
u
a
v
a ne
s
ted concatenations
commit
|
commitdiff
|
tree
2019-02-11
l
g
o
ubet
Remove accide
n
tal use of Guava
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
SWTExcept
i
on w
h
en sw
i
tching compariso
n
s i
n
a compare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
All
o
w clients to provide pre-computed
c
omparis
o
ns
to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
lgou
b
et
Ignore failing g
i
t tests for now
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Bu
m
p
versions to 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Use a
r
e
l
e
ased version of Siri
u
s
commit
|
commitdiff
|
tree
2018-11-30
lgo
u
bet
[541730]
R
everts d59c924 due to an UI freeze
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bump
fe
a
ture versions
commit
|
commitdiff
|
tree
2018-06-22
lgoube
t
bump versions
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
EM
F
C
o
m
pa
r
e is no longer compatibl
e
with e
g
i
t <
4
.
2
commit
|
commitdiff
|
tree
2018-06-05
lgoub
e
t
Introduce te
s
t
for merges wit
h
multiple ance
s
tors
commit
|
commitdiff
|
tree
2018-03-13
lg
o
ub
e
t
Removing
the
subversive integrati
o
n plugin
s
commit
|
commitdiff
|
tree
2018-01-30
lgoubet
Bump p
l
ugin and featu
r
e versions f
o
r
P
hoton
commit
|
commitdiff
|
tree
2018-01-24
lgou
b
e
t
R
e
moving the
Papyrus p
l
ugins and
f
e
atures
f
rom
th
e
.
.
.
commit
|
commitdiff
|
tree
2013-07-12
lg
o
ube
t
[410737] preserve orde
r
ing even
for e
q
ui
v
alent d
i
f
f
e
r
enc
e
s
.
commit
|
commitdiff
|
tree
next