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
Bu
m
p
v
ersions
to 3
.
3
.
13
commit
|
commitdiff
|
tree
2020-11-19
lgoub
e
t
Do not
c
lose the repo
s
itor
y
, getRepositoryCache()
.
c
l
ear
.
.
.
commit
|
commitdiff
|
tree
2020-10-21
lgoubet
Allo
w
lo
a
ding
o
f
m
od
e
ls using ID
a
t
t
r
ibutes for comparison
commit
|
commitdiff
|
tree
2020-10-21
lgoubet
Compatibility re
c
e
n
t mockito
commit
|
commitdiff
|
tree
2020-10-04
lg
o
ubet
Only
consider fi
l
es
w
e'v
e
extracted as potent
i
a
l test
.
.
.
commit
|
commitdiff
|
tree
2020-08-31
lgoubet
Del
e
te sub-projec
t
s fir
s
t whe
n
cleani
n
g
u
p te
s
t w
o
rkspace
commit
|
commitdiff
|
tree
2020-07-22
lgoube
t
Bump V
e
rsions
to 3
.
3
.
12
commit
|
commitdiff
|
tree
2020-07-22
lg
o
ubet
Fix name of 201
9
-12 target platform
commit
|
commitdiff
|
tree
2020-06-26
lgoubet
Fix GitTestSuppo
r
t
commit
|
commitdiff
|
tree
2020-05-26
l
gou
b
e
t
B
ump versio
n
s to 3
.
3
.
1
1
commit
|
commitdiff
|
tree
2020-04-21
lgoubet
Git test fra
m
e
work fa
i
ling on win
d
ow
s
commit
|
commitdiff
|
tree
2020-01-14
lgo
u
bet
Bump update sites to 3
.
3
.
1
0
commit
|
commitdiff
|
tree
2020-01-14
lg
o
u
b
et
Bu
m
p EMF Compare
t
o 3
.
3
.
1
0
a
nd
a
dd 2019-12 ta
r
get
platfor
m
commit
|
commitdiff
|
tree
2020-01-06
l
g
oubet
Prevent NPE from the closi
n
g of a Compari
s
on Dialog
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
Compatibility with JGit 5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lgou
b
et
P
o
tential NPE
when sw
i
tching files in t
h
e compare d
i
alog
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
S
witch EMF
Compar
e
to Gua
v
a 27
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Re-enable signing and tycho-p
2
-plugin, swi
t
ch website
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Bu
i
ld testing - disable
ty
c
ho-p2-plugi
n
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Build testin
g
-
d
i
sable ecl
i
p
s
e jarsigner
commit
|
commitdiff
|
tree
2019-09-24
l
g
o
u
bet
EMF Comp
a
re docume
n
tation jar is unsigned
commit
|
commitdiff
|
tree
2019-09-19
lgo
u
bet
Replace Guava with Ja
v
a
8
commit
|
commitdiff
|
tree
2019-09-19
lgoub
e
t
Potential race c
o
ndition
when loading
E
P
a
ckages for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
P
o
t
e
nti
a
l NPE with so
m
e implementati
o
ns of the property
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Some implementations of
Resource
.
Diagnosti
c
may return
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
EMF C
o
mpa
r
e
d
o
es n
o
t support
r
e
l
ativ
e
xs
i
:
s
chemaLocation
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoub
e
t
API compatibility
commit
|
commitdiff
|
tree
2019-09-18
l
g
o
ub
e
t
Rem
o
ve
part of guava uses
commit
|
commitdiff
|
tree
2019-09-18
l
g
oubet
B
ump to 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
l
goubet
Open the compare navigatab
l
e as in
t
e
r
nal A
P
I
commit
|
commitdiff
|
tree
2019-09-18
lgoub
e
t
R
e
gister the navigatable so that the to
o
lbar acti
o
ns
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
l
goubet
The navigatable's cache
n
e
eds to be
cleared when we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
The MatchEngineFactory
do
e
sn't ma
k
e use of its setters
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
Happy chec
k
style
commit
|
commitdiff
|
tree
2019-09-11
l
g
oubet
Up
d
a
t
e s
e
t
u
p file
commit
|
commitdiff
|
tree
2019-09-10
l
g
oubet
Tar
g
et
platform base
d
on 2019-06
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Behavior change in 20
1
9-06 - Exceptions a
r
e now in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lg
o
ube
t
Remove
the 32 bit plat
f
orms
f
or
o
ur target confi
g
u
rations
commit
|
commitdiff
|
tree
2019-09-06
lgo
u
bet
Index issue w
h
en merging non-
u
nique attribute
s
' eleme
n
ts
commit
|
commitdiff
|
tree
2019-09-06
l
g
o
u
b
et
D
i
ffs
depending
o
n
p
seudo-c
o
nfl
i
cts do not reject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
MOVE diffe
r
ence
s
a
l
so
need to take into
a
c
c
ount t
h
e
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
In
a
c
c
urate conflict
d
etection for moves
in n
o
n-containment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Move
s
wi
t
h non-unique valu
e
s and ad
d
ition/d
e
letions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Only MOVE di
f
fs need to
be
i
g
nored wh
e
n computing
the LCS
commit
|
commitdiff
|
tree
2019-09-04
l
goubet
Conflict
d
etection
o
n in
d
e
x
cha
n
ges must ta
k
e F
e
ature
F
i
l
t
er
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
l
goubet
Make sure the
U
I won't try to compute the
L
CS f
o
r huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
T
he "accept
/
reject" all
non-conflicting acti
o
n
s
houldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
Fi
x
diff, conflict d
e
tection and merging
o
f
non-un
i
que
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoubet
P
o
tential
o
u
t of bounds exception
commit
|
commitdiff
|
tree
2019-08-27
lgoubet
Compatibi
l
ity with jgit
5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgo
u
bet
P
erformance -
us
e
DiffCrossRe
f
erencer when poss
i
ble
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
r
egression - right-click actions on si
n
gl
e
diff s
e
l
e
ctions
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Open SMV API to
a
llow implem
e
n
t
ers to
acces
s
t
he raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
l
g
oubet
Prevents
exceptions from
b
eing thr
o
wn from
t
he viewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
l
g
oubet
Per
f
ormanc
e
-
use stream
s
instead
o
f guava ite
r
ations
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgou
b
et
P
erforma
n
ce - remove useless guava transformation
commit
|
commitdiff
|
tree
2019-07-17
lgou
b
et
Fix detection o
f
pseu
d
o c
o
nfli
c
ts on single-valu
e
d
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Regression on the group/m
a
tch
r
i
g
h
t-clic
k
a
ctions in
SMW
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Properly
d
e
scri
b
e
what th
e
conflict r
e
solving act
i
ons
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Add Stru
c
t
ureM
e
rgeViewer custom
i
z
ati
o
n opti
o
ns
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
S
h
ortc
u
t the UMLPostProcessor's subset implication
s
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoube
t
Prevent NPE
from o
v
e
r
riden Resource i
m
ple
m
entations
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Ignore
"origi
n
alTargetOb
j
e
cts" from the
EMF Compa
r
e
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgoubet
Bump versions to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
l
g
o
ubet
Adapt tests to EGit cha
n
ge of behavior
commit
|
commitdiff
|
tree
2019-05-29
l
g
o
ubet
En
a
bl
e
users t
o
m
erge all
confl
i
cts a
t
onc
e
through
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Merg
i
ng s
i
ngle
-
valu
e
d
c
ontainment c
h
anges can lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgo
u
bet
Typ
o
s
commit
|
commitdiff
|
tree
2019-05-23
l
goubet
P
revent LCS c
o
mputation
wh
e
n we do not need ordering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgoubet
Prev
e
n
t duplicate insertion points to be shown in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgoubet
Preve
n
t
CMV dispo
s
al w
h
en user s
e
lects multiple
ele
m
ents
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
l
goubet
Onl
y
add
new adapters when needed
commit
|
commitdiff
|
tree
2019-04-14
lg
o
ubet
Iterate over the
d
ifferences inst
e
ad of the matches
commit
|
commitdiff
|
tree
2019-04-09
lgoubet
Prevent OutOfM
e
mo
r
yErrors from the UI wh
e
n switc
h
ing CMV
commit
|
commitdiff
|
tree
2019-04-08
l
g
oubet
Performance - Comp
u
t
i
n
g re
q
ui
r
ements times
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
T
h
e UML tests
shouldn't use a c
a
che
d
instance of EMFComp
a
re
commit
|
commitdiff
|
tree
2019-04-03
lgoubet
Restore possibil
i
ty
t
o remove mer
g
ers
f
rom the registry
commit
|
commitdiff
|
tree
2019-03-22
lgoubet
M
ake sure we hook t
h
e U
I
when
u
ser
s
pro
v
id
e
a precomp
u
ted
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
l
g
oub
e
t
Bump EMF C
o
mpare to 3
.
3
.
7
in preparation for 2019-06
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Disposing of the co
m
parison shouldn't b
e
don
e
by the SMV
commit
|
commitdiff
|
tree
2019-03-04
lgoubet
A
v
o
i
d ClassCastExcepti
o
n
w
hen mer
g
in
g
feature map change
s
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Bump versions for 3
.
3
.
6
for 2019-03
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
pat
c
h ModelGitMergeE
d
itorI
n
put for EGit 5
.
3
.
0 compa
t
ibility
commit
|
commitdiff
|
tree
2019-02-26
lgoub
e
t
Suppress guava nest
e
d concatenations
commit
|
commitdiff
|
tree
2019-02-11
lg
o
ubet
Remove acciden
t
a
l
use of Guava
commit
|
commitdiff
|
tree
2019-02-11
lgo
u
bet
SWT
E
x
cept
i
on when switc
h
in
g
comparisons in
a
compare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Allow cli
e
nts to provide pre-c
o
mputed c
o
mp
a
risons to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
lgoubet
Ignore
f
ailin
g
git te
s
ts for now
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Bump version
s
to 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgo
u
b
e
t
Use a
r
eleased version of Sirius
commit
|
commitdiff
|
tree
2018-11-30
lgoubet
[541730]
R
everts d59c924 due to a
n
UI freeze
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bump featu
r
e versions
commit
|
commitdiff
|
tree
2018-06-22
lgoub
e
t
bump
v
ersions
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
EMF C
o
mp
a
re is
no l
o
nger compatible
w
i
th
egit < 4
.
2
commit
|
commitdiff
|
tree
2018-06-05
lgoub
e
t
Intr
o
duc
e
test for merges with
mu
l
tiple a
n
cestors
commit
|
commitdiff
|
tree
2018-03-13
lgoubet
R
e
m
ov
i
n
g
t
he subversiv
e
integra
t
ion plugins
commit
|
commitdiff
|
tree
2018-01-30
lgoubet
Bump
p
lugin a
n
d feature versions
f
o
r Photon
commit
|
commitdiff
|
tree
2018-01-24
lg
o
ubet
Rem
o
ving
the
Papyrus p
l
u
g
ins and f
e
at
u
res fro
m
the
.
.
.
commit
|
commitdiff
|
tree
2013-07-12
lg
o
ubet
[410737
]
preserve orderin
g
even for equival
e
n
t
differenc
e
s
.
commit
|
commitdiff
|
tree
2013-01-18
lgoubet
[367475
]
T
ake
git
s
pecificit
i
es
i
nto account
when resolv
i
ng
.
.
.
commit
|
commitdiff
|
tree
next