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 versi
o
ns to 3
.
3
.
13
commit
|
commitdiff
|
tree
2020-11-19
lgoubet
Do not
close the repos
i
tory, g
e
tRepository
C
ache()
.
clear
.
.
.
commit
|
commitdiff
|
tree
2020-10-21
l
g
oubet
Allow loading of mod
e
l
s
using ID attri
b
utes
f
or comp
a
rison
commit
|
commitdiff
|
tree
2020-10-21
l
goubet
Compatibil
i
ty r
e
cent mockito
commit
|
commitdiff
|
tree
2020-10-04
lgoubet
Only consider files w
e
've
e
xtracted as p
o
tential
t
e
s
t
.
.
.
commit
|
commitdiff
|
tree
2020-08-31
lgoubet
Delete sub-proj
e
ct
s
first whe
n
cleaning
u
p test workspace
commit
|
commitdiff
|
tree
2020-07-22
l
g
oubet
B
ump Ver
s
ions to 3
.
3
.
12
commit
|
commitdiff
|
tree
2020-07-22
l
g
oub
e
t
F
i
x n
a
me
o
f 2019-12 target
p
latform
commit
|
commitdiff
|
tree
2020-05-26
l
g
o
u
be
t
Bump versions
to 3
.
3
.
1
1
commit
|
commitdiff
|
tree
2020-01-14
lgoubet
Bump update sites to 3
.
3
.
10
commit
|
commitdiff
|
tree
2020-01-14
lgoubet
Bump EMF
Com
p
a
r
e t
o
3
.
3
.
10 and add
2
019-12 targe
t
platform
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
Prevent NPE f
r
o
m
th
e
clo
s
i
ng
of a
Com
p
ar
i
son
D
i
alog
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
Compatibil
i
ty with JGit
5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
Potential NPE when switching files in t
h
e
c
omp
a
re d
i
alog
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Re-enable sig
n
ing and tycho-p2-plugin, swit
c
h
w
e
bsite
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lgoub
e
t
B
uild te
s
ting -
d
isable
t
ych
o
-p2-plu
g
i
n
commit
|
commitdiff
|
tree
2019-09-25
lgoube
t
B
uild t
e
st
i
ng - disabl
e
eclipse jar
s
igner
commit
|
commitdiff
|
tree
2019-09-24
l
goubet
EMF Compare
docume
n
tat
i
on jar is unsig
n
ed
commit
|
commitdiff
|
tree
2019-09-19
lgoub
e
t
Replace Guav
a
with Java
8
commit
|
commitdiff
|
tree
2019-09-19
lgo
u
b
e
t
Potential race c
o
n
d
i
t
i
on whe
n
loading
EPacka
g
es
for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoub
e
t
Potential NPE with so
m
e implementations of the property
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoub
e
t
Some implemen
t
at
i
ons of R
e
source
.
Diagnos
t
ic may
r
etu
r
n
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgo
u
bet
EMF Compare does not
sup
p
o
r
t relative xs
i
:sche
m
aLocat
i
on
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
API compat
i
bility
commit
|
commitdiff
|
tree
2019-09-18
lgo
u
b
e
t
Remove par
t
of gua
v
a uses
commit
|
commitdiff
|
tree
2019-09-18
lgou
b
et
B
u
mp to 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
O
p
e
n
the compa
r
e
navigatable as
inte
r
nal API
commit
|
commitdiff
|
tree
2019-09-18
l
g
oubet
Registe
r
the
n
avigatable so that the too
l
bar acti
o
ns
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lgoubet
The n
a
v
ig
a
table's cache need
s
to be clear
e
d wh
e
n
we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lgou
b
et
T
he MatchEngi
n
e
Factory doesn't
mak
e
us
e
of its
s
ette
r
s
commit
|
commitdiff
|
tree
2019-09-16
l
goubet
Happy checkstyle
commit
|
commitdiff
|
tree
2019-09-11
lgo
u
bet
Updat
e
setu
p
file
commit
|
commitdiff
|
tree
2019-09-10
l
g
oubet
Target platform based on 20
1
9-06
commit
|
commitdiff
|
tree
2019-09-10
lg
o
ub
e
t
B
eha
v
i
o
r
c
hange in 2019-06 - Except
i
ons are now in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgoube
t
Remove the
3
2
bit platforms
f
or our target
c
on
f
igur
a
tions
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Index issue
when m
e
rging no
n
-
u
n
i
q
ue attributes' elements
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Diffs
depending on ps
e
udo-conf
l
icts do
n
o
t
reject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
MOVE differences also ne
e
d to take into account the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Inaccur
a
te co
n
flict det
e
ction for m
o
ves
in non-c
o
ntainment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Moves
with
n
o
n
-
unique val
u
e
s
and
addition/deletions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lg
o
ubet
Only MOVE
diffs
n
e
ed to b
e
ign
o
red when comp
u
ting
the LCS
commit
|
commitdiff
|
tree
2019-09-04
l
g
o
ubet
Conflict
d
etection on index changes must take Featu
r
eFilter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgou
b
et
Make sure
t
he UI wo
n
't try to comput
e
the L
C
S for h
u
ge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
The
"
acc
e
pt/re
j
ect" all
non-conflict
i
ng a
c
tion shouldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
Fix
di
f
f, conflict detect
i
o
n a
n
d merging
of non-unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoubet
P
o
t
ential out of bounds exc
e
ption
commit
|
commitdiff
|
tree
2019-08-27
lgoubet
Comp
a
tibi
l
i
t
y with
j
git 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
Pe
r
formance - use DiffCrossReferencer when possible
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
reg
r
e
ssion - right-click
a
ction
s
on s
i
ngle diff selections
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Open SMV AP
I
to a
l
lo
w
implementers to
a
c
c
e
s
s
the r
a
w
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Preve
n
ts exceptions
f
rom being thrown fro
m
the
view
e
r
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgo
u
b
e
t
Perf
o
rmance -
use streams instead
o
f guava iterat
i
ons
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
l
goubet
Performance - re
m
o
v
e useles
s
guava transformation
commit
|
commitdiff
|
tree
2019-07-17
C
h
r
i
stian
W
.
Dam
u
s
[522080] [UML] Add
-
a
dd
conflicts in ste
r
e
otype appl
i
cation
.
.
.
commit
|
commitdiff
|
tree
2019-07-17
lgoubet
Fix
de
t
ect
i
on of
pseudo
c
onflicts
o
n single-valued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
Re
g
res
s
ion on the group/m
a
tch righ
t
-
c
l
ick
ac
t
ions in SMW
commit
|
commitdiff
|
tree
2019-07-16
l
gou
b
et
Properly descr
i
be what the c
o
nflict resolving
a
ctions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Ma
r
tin Fle
c
k
[
5
06928]
Compar
i
so
n
ScopeEdito
r
Inp
u
t does not respect
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Add StructureMergeViewer customization
o
ption
s
commit
|
commitdiff
|
tree
2019-07-16
l
goubet
Sh
o
rtcut the UMLPostProcessor's subset implicat
i
ons
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Axe
l
Richard
Activatio
n
o
f all
G
it
t
ests
commit
|
commitdiff
|
tree
2019-07-16
lgo
u
bet
Pre
v
ent NPE from overri
d
en Resource im
p
leme
n
tations
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Ignore "origin
a
lTargetObjects" from the EMF C
o
m
p
a
re
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
l
goubet
Bump versions to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgoub
e
t
Adapt tests
to E
G
it cha
n
ge of
b
ehavior
commit
|
commitdiff
|
tree
2019-05-29
lgoubet
Enable us
e
rs to
merge all
c
onflicts at once t
h
rough
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Merging
sing
l
e-valued contai
n
ment chang
e
s
c
an le
a
d
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Typos
commit
|
commitdiff
|
tree
2019-05-23
lg
o
ubet
Pre
v
ent
L
CS
computatio
n
when we do not n
e
ed orde
r
i
ng
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgoubet
Prevent duplicate inser
t
ion points to be shown in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
l
goube
t
Prevent CMV dispo
s
al
wh
e
n user
sel
e
cts multiple
e
lements
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgoubet
Onl
y
add new adapt
e
rs when n
e
eded
commit
|
commitdiff
|
tree
2019-04-14
l
g
oubet
Itera
t
e over
t
he differences instead
o
f the matches
commit
|
commitdiff
|
tree
2019-04-09
lgoubet
Prevent OutO
f
MemoryError
s
from the UI when swit
c
hing CMV
commit
|
commitdiff
|
tree
2019-04-08
lg
o
ubet
Performance - Computing
r
equirem
e
nts times
commit
|
commitdiff
|
tree
2019-04-08
lgoub
e
t
The UML tests shouldn
'
t use a
cac
h
ed
i
n
st
a
nce o
f
EMFCompare
commit
|
commitdiff
|
tree
2019-04-03
lgo
u
bet
R
e
stor
e
possib
i
l
i
t
y to remove mergers fr
o
m the
r
egistry
commit
|
commitdiff
|
tree
2019-03-22
lg
o
ub
e
t
Make s
u
re we hook the
U
I w
h
en
users
p
rovide a p
r
e
computed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgou
b
et
Bump EMF Com
p
are
to 3
.
3
.
7 in preparation for 2019-06
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
D
isposing of the
c
o
m
paris
o
n
s
houl
d
n't
be done
b
y
t
h
e SMV
commit
|
commitdiff
|
tree
2019-02-26
lg
o
ube
t
Bum
p
versions f
o
r
3
.
3
.
6 for
2
019
-
03
commit
|
commitdiff
|
tree
2019-02-26
lgou
b
e
t
patch Model
G
itMergeEdit
o
rInput f
o
r EGit 5
.
3
.
0
compatibility
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Suppress guava nested concatenations
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Remov
e
acc
i
dental use of Guava
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
SW
T
Exce
p
tio
n
w
hen sw
i
tching comparisons in a compare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
l
g
ou
b
et
Allow clie
n
ts t
o
pr
o
vide pre-computed comparisons to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
lgoubet
Ignore fail
i
ng git
tests
for
now
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Bu
m
p ve
r
sions to 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgoube
t
Use
a released
version of Siri
u
s
commit
|
commitdiff
|
tree
2018-11-30
lgoubet
[541730]
Re
v
erts
d
5
9
c924 due
to
a
n
UI freeze
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bump
f
eatur
e
versions
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bu
m
p v
e
rsions
commit
|
commitdiff
|
tree
2018-06-22
Stép
h
ane Thiba
u
d
e
a
u
Extension poi
n
t to pro
v
ide specif
i
c matchi
n
g
r
ules
.
.
.
commit
|
commitdiff
|
tree
2018-06-22
Stépha
n
e Thibaudeau
EM
F
Comp
a
re
is c
o
mpatible wi
t
h JGit 5
.
*
ve
r
s
ions
commit
|
commitdiff
|
tree
2018-06-22
S
t
éphane Thibau
d
eau
Add explici
t
dependen
c
y
to org
.
e
c
lipse
.
gef
commit
|
commitdiff
|
tree
2018-06-22
Stépha
n
e Thiba
u
deau
Do
n
ot
minimize identical resour
c
es when Xtext is
u
sed
commit
|
commitdiff
|
tree
2018-06-22
Stéphane
T
hibaud
e
au
Use w
h
ite
-
list strategy to ret
r
ieve the
Mode
l
p
r
ovider
commit
|
commitdiff
|
tree
2018-06-22
S
téphane Thibaudeau
Bette
r
handling of Xtext with Li
v
e sc
o
pe op
t
ion
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
EMF Compare is
n
o l
o
n
g
er compatible with e
g
i
t < 4
.
2
commit
|
commitdiff
|
tree
2018-06-05
lgoubet
Introduce
t
est for merges wit
h
multiple ancestors
commit
|
commitdiff
|
tree
next