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
Re-enable signing and tycho-p2-plugin, switch website to antrun
2019-09-25
lgoubet
Re-enable signing and tycho
-
p2-
p
l
u
gin, switch website
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lgo
u
be
t
Build testing - disable tyc
h
o-p2-plugin
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Build
t
est
i
ng
- disable
eclipse
j
arsi
g
ner
commit
|
commitdiff
|
tree
2019-09-24
lgoube
t
EMF Compare documenta
t
io
n
j
ar is
uns
i
gned
commit
|
commitdiff
|
tree
2019-09-19
l
goubet
Repla
c
e Gu
a
va with Java 8
commit
|
commitdiff
|
tree
2019-09-19
lg
o
ubet
Potentia
l
race condition when loading E
P
ackages for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
l
goube
t
P
o
tential
NPE with some im
p
leme
n
tati
o
ns of
the prope
r
ty
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoub
e
t
S
om
e
i
mplemen
t
a
t
i
o
n
s of Resource
.
D
i
agnostic may return
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lg
o
ubet
EMF Compare
does
n
ot su
p
port relati
v
e xsi:sch
e
maLocation
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
A
PI c
o
mpatibi
l
ity
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Remove
part of guav
a
u
ses
commit
|
commitdiff
|
tree
2019-09-18
lgoub
e
t
Bump
t
o 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lgo
u
bet
Open the compare naviga
t
able as internal API
commit
|
commitdiff
|
tree
2019-09-18
lgoube
t
Register the navigatable so that th
e
toolbar
a
c
tio
n
s
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
l
goubet
The
naviga
t
a
b
le's
c
a
che n
e
eds
t
o be
cleared when
we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
The Mat
c
hEngineFactory does
n
't make use of its sette
r
s
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
H
a
p
p
y checkstyle
commit
|
commitdiff
|
tree
2019-09-11
lgoubet
Upda
t
e setup file
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
T
a
rget platform based on 2019-06
commit
|
commitdiff
|
tree
2019-09-10
lgoube
t
Beh
a
v
i
or
c
hange in 2019-06 - Exceptions
a
re now in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
l
g
o
u
bet
Remove th
e
3
2
b
i
t platforms for
o
ur tar
g
et con
f
igur
a
t
i
ons
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
I
ndex issue whe
n
me
r
ging
no
n
-unique attributes'
el
e
ments
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Diffs depe
n
di
n
g on pseudo-confli
c
t
s do
n
ot reject t
h
e
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lg
o
ub
e
t
MOVE
differences also need to
t
ake
i
nto account the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoub
e
t
Inaccu
r
ate conflict
detection f
o
r
mo
v
es in
non-c
o
ntainm
e
n
t
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoub
e
t
Moves
w
i
t
h non
-
unique values
a
nd addition
/
deletions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
O
nly
MOVE diffs need t
o
be
i
g
n
ored whe
n
comput
i
ng the LCS
commit
|
commitdiff
|
tree
2019-09-04
l
go
u
bet
C
on
f
lict detectio
n
on index changes must take FeatureFilter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lg
o
ubet
Make
s
ur
e
the
U
I
w
o
n't try to com
p
u
te th
e
LCS
f
or huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
The "accept/reject" al
l
non-conf
l
ict
i
ng action shou
l
dn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
l
goubet
Fix
d
iff, c
o
nflict de
t
e
ct
i
on
and mergi
n
g
o
f non-unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgo
u
b
e
t
Potential ou
t
of bou
n
ds excep
t
ion
commit
|
commitdiff
|
tree
2019-08-27
lgoubet
Com
p
at
i
bili
t
y w
i
t
h
j
g
it 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
P
er
f
ormance - u
s
e DiffCross
R
e
f
erencer w
h
en
possible
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
re
g
r
e
ssion -
r
ight-cli
c
k act
i
o
ns on single
d
iff
s
e
lec
t
ions
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
l
g
oubet
O
pen SMV API t
o
allow implement
e
rs to access
t
he
raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoub
e
t
Preven
t
s
exception
s
from
bei
n
g thrown from the viewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
Perf
o
rmanc
e
-
us
e
streams instead
o
f guava iterations
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
Performance - remove useless guava transf
o
r
m
ation
commit
|
commitdiff
|
tree
2019-07-17
C
h
ristian W
.
Dam
u
s
[
52208
0
] [UML]
A
dd
-
ad
d
co
n
f
l
ic
t
s in s
t
ere
o
t
y
p
e
a
p
plication
.
.
.
commit
|
commitdiff
|
tree
2019-07-17
lgou
b
et
F
ix detection
o
f pseudo con
f
l
icts on sin
g
le
-
val
u
e
d
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
Regress
i
on on the
group/
m
atch
r
i
ght-
c
l
ic
k
action
s
in SM
W
commit
|
commitdiff
|
tree
2019-07-16
l
goubet
Prope
r
ly
desc
r
ibe
w
hat the confl
i
ct
r
eso
l
ving actio
n
s
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Martin Fl
e
ck
[506928]
ComparisonScopeE
d
itorInpu
t
does not res
p
ect
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Stefan Dirix
Ca
n
c
el Fa
s
ter in
Proxim
i
tyEObjectMatcher
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Add St
r
u
ct
u
r
eM
e
rgeViewer c
u
st
o
mization options
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Sho
r
tcut
t
he UM
L
Po
s
t
Process
o
r's subset implic
a
tions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Ax
e
l R
i
chard
Activation of
all Git tests
commit
|
commitdiff
|
tree
2019-07-16
lgo
u
be
t
Prevent NPE from overriden Resource im
p
lem
e
n
t
ations
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Ignore "originalTarget
O
bject
s
" from the EMF Comp
a
r
e
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgoubet
B
ump versi
o
ns to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
William
P
iers
Enabled "
a
ccep
t
change" action on
mult
i
ple diff sel
e
ction
commit
|
commitdiff
|
tree
2019-07-04
lgoubet
Adapt
t
ests
to EGit chan
g
e
of behavio
r
commit
|
commitdiff
|
tree
2019-05-29
lgoube
t
Enable users
t
o merge
all conflicts at
o
nce through
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgou
b
et
Merging sin
g
le-valued contai
n
m
e
nt cha
n
g
e
s can lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Typos
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Prevent LCS computation whe
n
we
do not nee
d
ord
e
r
i
ng
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgoub
e
t
Preven
t
duplicate in
s
ertion po
i
n
ts to be shown in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
l
goubet
Prevent CMV disposal
when
u
ser selects multiple
elemen
t
s
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgou
b
et
Only
add
n
ew adapters when neede
d
commit
|
commitdiff
|
tree
2019-04-14
lgo
u
bet
Iterate over the difference
s
i
nstead of the matches
commit
|
commitdiff
|
tree
2019-04-09
lgoubet
Preven
t
OutOfMemo
r
yErrors from the UI when switching
CMV
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
P
e
rfo
r
m
a
nce - Computing r
e
quirements t
i
mes
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
The UML
tests shou
l
d
n't use a cached
i
n
st
a
nce of
EMFCompare
commit
|
commitdiff
|
tree
2019-04-03
l
g
oubet
Res
t
ore
p
ossib
i
lity to remove m
e
rgers from
the registry
commit
|
commitdiff
|
tree
2019-04-01
Wi
l
liam Piers
Fixed Arra
y
O
utOfB
o
unds in cas
e
of empty lists
commit
|
commitdiff
|
tree
2019-03-22
lgoub
e
t
M
ake su
r
e
we hook t
h
e UI
w
he
n
use
r
s
provide a p
r
ec
o
mputed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
l
g
oubet
Bum
p
EMF
Compa
r
e
to 3
.
3
.
7 in preparation for 201
9
-06
commit
|
commitdiff
|
tree
2019-03-21
lgou
b
et
Disp
o
sing of the comparison shoul
d
n
't be do
n
e
b
y
the SMV
commit
|
commitdiff
|
tree
2019-03-04
lgou
b
et
Avoid ClassCastEx
c
eption when
m
erging feature
map ch
a
n
ges
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
B
u
mp versions for 3
.
3
.
6 for
2
019-03
commit
|
commitdiff
|
tree
2019-02-26
l
g
oubet
patch M
o
delGitMe
r
ge
E
ditorInput for EGit 5
.
3
.
0 compatibility
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Suppres
s
guava nested conc
a
t
e
nations
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Remove accidental use of G
u
ava
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
SWTExcep
t
ion when s
w
i
t
ching co
m
parisons in a compare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgou
b
et
Allow clients to prov
i
de
pre-co
m
puted compari
s
ons t
o
.
.
.
commit
|
commitdiff
|
tree
2018-12-11
Ph
i
l
ip Langer
[527567
]
P
rovide supp
o
rt for a gen
e
ral proper
t
y merge
.
.
.
commit
|
commitdiff
|
tree
2018-12-11
P
hilip
Langer
[51407
9
]
I
mprove mirror
i
ng support
commit
|
commitdiff
|
tree
2018-12-04
lgoubet
Ignor
e
failing git
te
s
ts for now
commit
|
commitdiff
|
tree
2018-12-03
lg
o
u
bet
Bump versions
to 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgoube
t
U
s
e
a
releas
e
d version of Siriu
s
commit
|
commitdiff
|
tree
2018-11-30
lgoubet
[
541730] Reverts d59
c
924
d
ue to an
UI freeze
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bump feature
v
ersions
commit
|
commitdiff
|
tree
2018-06-22
lg
o
ubet
bump versions
commit
|
commitdiff
|
tree
2018-06-22
Stéphane Thibaud
e
au
Extension p
o
int to provide
speci
f
ic m
a
tching r
u
le
s
.
.
.
commit
|
commitdiff
|
tree
2018-06-22
Stéphane Th
i
baudeau
Remove useless and m
y
sterio
u
s code
commit
|
commitdiff
|
tree
2018-06-22
Stéphane Thiba
u
d
e
au
E
M
F
Compare is compatibl
e
with JGit
5
.
* versions
commit
|
commitdiff
|
tree
2018-06-22
Stéphane Thibaudeau
Add exp
l
i
c
it
d
ependency
to org
.
eclipse
.
gef
commit
|
commitdiff
|
tree
2018-06-22
Stéphane
T
h
ibaudeau
Do not minimize iden
t
ical
r
esour
c
e
s
whe
n
Xtext is used
commit
|
commitdiff
|
tree
2018-06-22
Stéphane Thi
b
audeau
Us
e
white-list strategy to retrieve the Mod
e
l
p
r
ovider
commit
|
commitdiff
|
tree
2018-06-22
Stéphane
T
hibaudeau
Bett
e
r handling of Xtext with Liv
e
scope option
commit
|
commitdiff
|
tree
2018-06-22
l
goubet
E
M
F Compar
e
is no lo
n
ger c
o
mpatible wit
h
egit
<
4
.
2
commit
|
commitdiff
|
tree
2018-06-05
lgo
u
bet
Introd
u
ce test for merges with
multipl
e
ancestors
commit
|
commitdiff
|
tree
2018-06-04
Arthur D
a
u
s
s
y
[534365] Fix R
e
cursiveModelMerger for "bina
r
y" git
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
Arthur
Daussy
Do
no
t
handle "merge
d
" files t
w
ice wh
e
n JGit stages
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
Arthur D
a
u
ssy
[
535200]
C
r
eate
a new Tre
e
W
a
l
k
i
ns
t
ead reusing one
commit
|
commitdiff
|
tree
2018-05-03
Philip Lange
r
Improve perfor
m
ance of Di
f
fU
t
i
l
commit
|
commitdiff
|
tree
2018-05-03
Philip Lang
e
r
Impro
v
e perfo
r
man
c
e of C
o
mparisio
n
Util
commit
|
commitdiff
|
tree
2018-05-03
Phi
l
i
p
Langer
Im
p
rove performance of equality hel
p
er
commit
|
commitdiff
|
tree
2018-05-01
Chri
s
tian
W
.
Damus
[5254
7
3] [Pap
y
rus] Connections disa
p
pear when
comp
a
ring
.
.
.
commit
|
commitdiff
|
tree
next