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.11
2020-05-26
lgoubet
B
u
mp version
s
t
o
3
.
3
.
11
commit
|
commitdiff
|
tree
2020-01-14
lgoubet
Bump update sites to 3
.
3
.
1
0
commit
|
commitdiff
|
tree
2020-01-14
l
g
oubet
B
u
mp EMF Compare t
o
3
.
3
.
10 and add 2019-12 target platform
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
Prevent NPE
from the
cl
o
sing of
a
Co
m
pa
r
ison Di
a
log
commit
|
commitdiff
|
tree
2020-01-06
l
g
oubet
Compatibil
i
ty with J
G
i
t
5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
P
o
tentia
l
NPE
w
h
en swit
c
hing files in the co
m
pare di
a
log
commit
|
commitdiff
|
tree
2019-09-25
l
g
o
ubet
Re-
e
nable si
g
n
ing
a
nd tycho-p2
-
plugi
n
,
s
w
itch website
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lgoube
t
Bui
l
d
testi
n
g
- disa
b
le tycho-p2-plugin
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Build testi
n
g - disab
l
e eclipse j
a
rsigner
commit
|
commitdiff
|
tree
2019-09-24
l
goubet
EMF Comp
a
re do
c
umentation jar
is u
n
sign
e
d
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Re
p
lace Guava with Java 8
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Poten
t
ial rac
e
condition when loading EPackages for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lg
o
ubet
Poten
t
ial
N
PE wi
t
h
some
i
mp
l
ementations of the p
r
o
perty
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Some impl
e
men
t
ation
s
of R
e
s
o
ur
c
e
.
Di
a
gnostic may r
e
turn
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoube
t
EMF Compare does not supp
o
rt relativ
e
x
s
i
:
schemaLocation
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoube
t
API com
p
at
i
bility
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Remov
e
part of guava use
s
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Bum
p
to 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
l
goubet
Open
the compare navigata
b
le
a
s
internal API
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Regis
t
e
r the navig
a
table so that the toolb
a
r actions
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lgo
u
bet
The navigatable's
cache
needs to be cleared w
h
en
we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
The MatchEngineFac
t
or
y
doesn't mak
e
u
se
of its setters
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
H
a
ppy ch
e
ckstyle
commit
|
commitdiff
|
tree
2019-09-11
lgou
b
et
Update se
t
up file
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Ta
r
get platform based o
n
2019-06
commit
|
commitdiff
|
tree
2019-09-10
l
g
oubet
Behavio
r
ch
a
nge in 2019-06
- Exceptions are now in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgoubet
Rem
o
ve the 32 bit platforms for our target configur
a
t
ions
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Index issue
when merging non-unique attributes' elements
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
D
iffs depending on ps
e
ud
o
-co
n
flicts do not
rej
e
ct the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
MOVE
d
if
f
er
e
nces a
l
so need to take
into account the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgo
u
bet
I
n
accurate
c
onflic
t
detection
for moves in non-containment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
l
go
u
b
e
t
Moves wi
t
h non-un
i
que values
a
nd
a
d
dit
i
o
n/dele
t
ions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
O
n
ly
MOVE diffs
ne
e
d
to b
e
ignored when computi
n
g the LCS
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Conflict
detection on i
n
dex c
h
ang
e
s must take
F
eatureFilter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Make sure the
U
I won't try to compute the
LCS for
h
uge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lg
o
ubet
T
he "acce
p
t
/
reject" all non-c
o
nflicting action s
h
ould
n
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoub
e
t
Fix
d
iff, confli
c
t detec
t
ion a
n
d
merging of n
o
n
-
unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoubet
P
o
t
ential out of bo
u
nds e
x
cept
i
on
commit
|
commitdiff
|
tree
2019-08-27
lgoubet
C
o
mpatibili
t
y with jg
i
t 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoub
e
t
Performan
c
e -
u
se DiffCr
o
ssReferenc
e
r when possible
commit
|
commitdiff
|
tree
2019-08-22
l
gou
b
e
t
regression - right-click actions
on sin
g
le
d
iff
selections
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lg
o
ubet
O
pen
S
MV
API to allow imple
m
enters
to acce
s
s the raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
l
g
o
u
bet
P
r
events exceptions from being thr
o
wn from the
v
iewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
Perf
o
r
m
ance - use st
r
eams instead of guava iterations
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
l
goubet
Per
f
ormance - remove usele
s
s guav
a
transformation
commit
|
commitdiff
|
tree
2019-07-17
Christian W
.
Damus
[522080
]
[UML] Add-add conflicts in stereotype ap
p
li
c
atio
n
.
.
.
commit
|
commitdiff
|
tree
2019-07-17
l
goub
e
t
Fix detection
o
f pseudo co
n
fl
i
cts on single-valued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoub
e
t
Regression on the group/mat
c
h right-click
a
ctions in
SMW
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
Properly de
s
cribe
what the conflict reso
l
v
i
ng ac
t
i
ons
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Martin Fl
e
ck
[506928] Com
p
a
r
i
s
onScop
e
E
d
itorInput does not re
s
pect
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgou
b
et
Add S
t
ructureMerge
V
iewer customiz
a
t
i
o
n
options
commit
|
commitdiff
|
tree
2019-07-16
lgou
b
et
S
hortcut the UMLPos
t
Proce
s
sor's subset impli
c
ations
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
A
xel Ri
c
hard
Activation of all Git test
s
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
Prevent NPE from
o
verriden Resource implementation
s
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Ig
n
ore "
o
r
iginalTargetObjects" from the EM
F
C
ompare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgou
b
et
B
u
mp v
e
rsion
s
to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgoubet
Adapt tests
t
o E
G
i
t
ch
a
ng
e
o
f beha
v
i
o
r
commit
|
commitdiff
|
tree
2019-05-29
lgo
u
bet
Enable users to merge all conflicts at once through
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
M
e
r
ging single-value
d
contai
n
ment ch
a
nges can lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgou
b
et
Ty
p
os
commit
|
commitdiff
|
tree
2019-05-23
lgo
u
bet
Prevent LC
S
computa
t
ion when
w
e
do not need ordering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgo
u
bet
P
r
e
vent duplicate in
s
ertion points to be shown
in tre
e
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgo
u
bet
Prevent CMV disposal when user sel
e
cts
m
ultiple
e
leme
n
ts
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
l
g
o
ubet
Only add new
adapters
when needed
commit
|
commitdiff
|
tree
2019-04-14
lgoubet
Iterate over the dif
f
e
r
enc
e
s instead of
t
he matches
commit
|
commitdiff
|
tree
2019-04-09
lgoub
e
t
Preve
n
t OutOfMemo
r
yErrors from the UI wh
e
n s
w
itching CM
V
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
Performance -
C
om
p
u
t
in
g
re
q
u
i
rements
t
im
e
s
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
The
U
ML tests shou
l
d
n
'
t
u
s
e a
c
ached
i
n
st
a
nce o
f
EMFCom
p
ar
e
commit
|
commitdiff
|
tree
2019-04-03
lgoubet
Restore
p
ossibility to remove mergers from t
h
e
r
egistr
y
commit
|
commitdiff
|
tree
2019-03-22
lgoubet
Make s
u
re we hook the UI when us
e
rs provide
a prec
o
mpute
d
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lg
o
ubet
Bump EM
F
Compare t
o
3
.
3
.
7 in prepara
t
ion for 201
9
-
0
6
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Disposing
o
f the comp
a
rison s
h
ouldn't be done by t
h
e
S
MV
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Bump versions for 3
.
3
.
6
f
or 2019-
0
3
commit
|
commitdiff
|
tree
2019-02-26
l
g
oubet
patch Mod
e
lGitMerg
e
EditorInput for EGit 5
.
3
.
0 com
p
at
i
bility
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Suppress guava
ne
s
ted co
n
catenation
s
commit
|
commitdiff
|
tree
2019-02-11
lg
o
ube
t
Rem
o
ve
a
ccident
a
l use
o
f
Guava
commit
|
commitdiff
|
tree
2019-02-11
lgoube
t
SWTExcep
t
ion when
switching
c
ompari
s
o
ns in a compare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Al
l
ow
c
lie
n
t
s
to provide pre-computed comparisons to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
lgoubet
Ignore
f
ai
l
ing
g
i
t tests for now
commit
|
commitdiff
|
tree
2018-12-03
lgo
u
bet
Bu
m
p versions to 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Use a released version of Siriu
s
commit
|
commitdiff
|
tree
2018-11-30
lgoubet
[541730]
R
e
v
erts
d
59c924 due to an
U
I fr
e
e
ze
commit
|
commitdiff
|
tree
2018-06-22
lg
o
ubet
bump feature versions
commit
|
commitdiff
|
tree
2018-06-22
lgo
u
bet
bump
v
ersions
commit
|
commitdiff
|
tree
2018-06-22
S
t
éphane Thibaudea
u
Extens
i
on point
t
o
p
r
ovide spe
c
ific matc
h
ing
r
u
l
es
.
.
.
commit
|
commitdiff
|
tree
2018-06-22
Stépha
n
e T
h
ibaudeau
EMF C
o
mpare
i
s com
p
a
tible wit
h
JGit 5
.
* v
e
r
s
ions
commit
|
commitdiff
|
tree
2018-06-22
Stéphane Thi
b
aud
e
au
Add
ex
p
licit dep
e
nden
c
y
t
o
o
r
g
.
eclip
s
e
.
gef
commit
|
commitdiff
|
tree
2018-06-22
S
t
é
p
hane
Thibaudeau
Do not min
i
m
ize identical resources wh
e
n Xtext is
u
se
d
commit
|
commitdiff
|
tree
2018-06-22
Stép
h
ane
T
hibaudeau
U
se wh
i
te-
l
i
st strategy
t
o retrieve the
Model p
r
o
v
i
der
commit
|
commitdiff
|
tree
2018-06-22
Sté
p
h
a
ne Thibaud
e
au
Better han
d
ling
of Xtext with Live scop
e
o
p
t
ion
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
E
M
F Compare is n
o
longe
r
c
o
m
patible wit
h
egit
<
4
.
2
commit
|
commitdiff
|
tree
2018-06-05
lgoubet
Introduce test for merges with multi
p
le
a
n
c
estors
commit
|
commitdiff
|
tree
2018-05-03
Philip Langer
Improve performance of
DiffUtil
commit
|
commitdiff
|
tree
2018-05-03
Phi
l
ip L
a
n
ger
Improve
performance of ComparisionUtil
commit
|
commitdiff
|
tree
2018-05-03
Philip Langer
I
mprove
p
erformance
o
f equality
h
elper
commit
|
commitdiff
|
tree
2018-03-16
Laurent Go
u
bet
Al
l
ow p
r
o
x
y reso
l
ution from th
e
EMF C
o
mpare
c
ontent
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent
Goubet
Allow
proxy resoluti
o
n
f
ro
m
the EMF Compare s
t
ructure
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent Gou
b
et
SMV action to reveal
a
ll differences in confli
c
t wit
h
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
L
a
ure
n
t Goubet
Add ac
t
ions to merge e
v
eryth
i
ng to
"
g
et right" or
.
.
.
commit
|
commitdiff
|
tree
2018-02-05
Christia
n
W
.
Damus
[522064] P
r
ofile-
a
p
p
lic
a
tion v
e
rsion
c
h
e
ck too restrictive
.
.
.
commit
|
commitdiff
|
tree
next