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
l
g
o
u
bet
Re-
e
nable sig
n
ing an
d
tyc
h
o-p2-plu
g
in,
s
witch website
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lg
o
ubet
Build t
e
stin
g
-
disable tycho-p2-
p
l
u
gin
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
B
u
i
l
d testi
n
g
-
dis
a
ble
e
cl
i
p
s
e jarsig
n
er
commit
|
commitdiff
|
tree
2019-09-24
l
goubet
EMF Compare doc
u
mentation jar i
s
uns
i
g
n
ed
commit
|
commitdiff
|
tree
2019-09-19
lg
o
ubet
R
eplace G
u
ava wi
t
h Java 8
commit
|
commitdiff
|
tree
2019-09-19
l
go
u
bet
Potential race cond
i
tion when load
i
ng EPa
c
ka
g
es
for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lg
o
u
b
et
Pot
e
ntial N
P
E wit
h
so
m
e i
m
plementations
o
f the pr
o
pert
y
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Some implem
e
ntations of Resourc
e
.
Diagnostic may return
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
l
g
o
ubet
EMF Co
m
pare does not su
p
p
ort relative x
s
i:s
c
hemaLocation
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
API compatibi
l
ity
commit
|
commitdiff
|
tree
2019-09-18
l
g
o
ubet
Remove part o
f
g
u
av
a
use
s
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Bump to 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lgoube
t
O
pen the
compare navigatabl
e
as int
e
rna
l
API
commit
|
commitdiff
|
tree
2019-09-18
lg
o
ubet
Registe
r
th
e
na
v
igatable
so that the toolbar actions
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lgoubet
The
n
a
vigatable
'
s cache
n
e
eds to be
c
leared when we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
The MatchEngin
e
Fac
t
or
y
doesn't make
use of its sette
r
s
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
Happy checkstyl
e
commit
|
commitdiff
|
tree
2019-09-11
lg
o
ubet
U
p
date setup file
commit
|
commitdiff
|
tree
2019-09-10
lgou
b
e
t
Tar
g
e
t
p
latform
b
as
e
d
o
n 2019-06
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Behavior c
h
a
n
ge in 2
0
19-0
6
- Exceptions are now in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lg
o
ubet
Remove
t
h
e
32 bit pl
a
t
forms for o
u
r target co
n
figurations
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Index
i
ssue wh
e
n merging non-un
i
q
u
e
a
ttri
b
utes'
e
lements
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Dif
f
s d
e
pendi
n
g
on p
s
eudo-
c
o
n
flicts do n
o
t
r
eject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
l
g
o
ubet
MOVE
d
ifferences also need to take into accou
n
t the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
I
naccurate conflict
d
etecti
o
n for moves in
n
on-containment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgou
b
e
t
Moves with non-unique
values and addition/de
l
etions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Only MOVE
d
iffs
need
t
o
be ignored
w
hen comput
i
ng t
h
e LCS
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Conflict de
t
ection on index changes must take Fe
a
tu
r
eFilter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgo
u
bet
Ma
k
e su
r
e the UI wo
n
't try to comp
u
te
t
he LC
S
for huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
l
g
o
u
bet
The "acc
e
pt/reject
"
all non-conflicti
n
g action
shoul
d
n
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoub
e
t
Fix diff, co
n
flict detection and
merging of
n
on-uni
q
ue
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoubet
Potenti
a
l ou
t
of boun
d
s excepti
o
n
commit
|
commitdiff
|
tree
2019-08-27
lgou
b
et
C
ompatibility with jgit 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
Pe
r
formance - use Diff
C
rossReferencer
when
poss
i
bl
e
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
regression - right-click ac
t
ions on sin
g
le
d
i
ff
s
elections
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoub
e
t
O
p
en
SMV API
to
a
llow implemente
r
s to ac
c
ess the raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Preve
n
ts exceptions from
b
eing thr
o
wn from the viewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoub
e
t
Performance - use
s
treams inst
e
ad
o
f gu
a
va
itera
t
ion
s
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
l
g
oubet
Per
f
ormance -
re
m
ove
usel
e
ss guava tra
n
sf
o
r
mat
i
on
commit
|
commitdiff
|
tree
2019-07-17
lg
o
ubet
Fix detection of pseudo conflicts on
s
ingle-valued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Regressi
o
n
o
n the group/match right-click actions in SMW
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Prop
e
rly desc
r
ibe
wh
a
t the conflict resolving actions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
A
dd S
t
ructureMergeV
i
ewer custo
m
ization
o
ption
s
commit
|
commitdiff
|
tree
2019-07-16
l
g
oubet
S
h
ortcut the UMLPo
s
tProcessor's
s
ub
s
et imp
l
ica
t
ions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
P
revent NPE from ov
e
rriden Re
s
ource
implem
e
ntations
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Ignore "o
r
iginalTarge
t
Ob
j
e
c
ts" fro
m
the EM
F
Compare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgoubet
Bump ve
r
si
o
ns
t
o 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgoubet
Adapt
tes
t
s to EGi
t
c
hange of behavior
commit
|
commitdiff
|
tree
2019-05-29
lgoube
t
Enable user
s
t
o merge all c
o
nflicts at o
n
ce through
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Merging
single-v
a
lued containm
e
nt
changes c
a
n lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
T
y
pos
commit
|
commitdiff
|
tree
2019-05-23
l
g
oubet
Prevent LCS
c
omputation when we do not need order
i
ng
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
l
g
oubet
Prevent duplicate insertion points to be s
h
own in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgoubet
Prevent CMV disposa
l
when user selec
t
s
mul
t
iple elements
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgoubet
Only add new
adapters when needed
commit
|
commitdiff
|
tree
2019-04-14
lgo
u
bet
I
t
era
t
e ov
e
r the d
i
f
f
erences
i
nstead of the matches
commit
|
commitdiff
|
tree
2019-04-09
lgoubet
P
revent Out
O
fMe
m
oryErr
o
rs from the UI when switching CMV
commit
|
commitdiff
|
tree
2019-04-08
lgo
u
bet
Perform
a
n
c
e -
C
omputing requir
e
ments
t
imes
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
The UML tests should
n
'
t
use a
cached instance of EMF
C
ompare
commit
|
commitdiff
|
tree
2019-04-03
lgoubet
Res
t
ore possibility to rem
o
v
e me
r
gers fr
o
m the regist
r
y
commit
|
commitdiff
|
tree
2019-03-22
lgoubet
Ma
k
e sure we hook th
e
UI w
h
e
n
users provide a pre
c
o
m
p
u
te
d
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lg
o
u
be
t
Bump EMF Comp
a
r
e to 3
.
3
.
7 in preparation for 2019-06
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Dispo
s
in
g
of the com
p
ariso
n
shouldn
'
t be done by the SMV
commit
|
commitdiff
|
tree
2019-03-04
lgoubet
Avoid
ClassCa
s
tException wh
e
n
merg
i
ng fea
t
u
re map changes
commit
|
commitdiff
|
tree
2019-02-26
lgo
u
bet
B
u
mp versions fo
r
3
.
3
.
6 for 2019-
0
3
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
patch M
o
delGi
t
M
ergeE
d
itorInput for EGit
5
.
3
.
0
c
o
m
patibili
t
y
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Suppre
s
s gua
v
a nested concatenation
s
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Remove
a
ccide
n
t
a
l u
s
e of Guav
a
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
SWTExcep
t
io
n
when s
w
itchi
n
g compar
i
s
o
ns i
n
a
c
o
mp
a
re
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
All
o
w cli
e
nt
s
to pr
o
vide pre-computed comparisons to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
l
goub
e
t
I
g
nore failin
g
git tests for now
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Bump v
e
r
sions to
3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Use a released version of
S
ir
i
us
commit
|
commitdiff
|
tree
2018-11-30
lgo
u
bet
[541730]
R
everts
d
59
c
924 due
to an UI freeze
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
b
u
mp featu
r
e
v
ersions
commit
|
commitdiff
|
tree
2018-06-22
lgo
u
b
e
t
b
ump versions
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
E
M
F
Compare is no l
o
nger
c
ompatible with egit < 4
.
2
commit
|
commitdiff
|
tree
2018-06-05
l
g
oubet
Intro
d
uce test for mer
g
es with multiple ancestors
commit
|
commitdiff
|
tree
2018-03-13
lgoubet
Remo
v
i
n
g
t
he subv
e
rsive
i
nt
e
gr
a
ti
o
n plugins
commit
|
commitdiff
|
tree
2018-01-30
lgo
u
b
e
t
B
u
mp plugin
and feature v
e
rsions
f
or
P
h
oton
commit
|
commitdiff
|
tree
2018-01-24
lgoubet
Re
m
o
v
i
n
g
the Papyrus plugins
and
f
eatures f
r
om
t
he
.
.
.
commit
|
commitdiff
|
tree
2013-07-12
lgoubet
[4107
3
7] preserve o
r
dering even for
equi
v
alen
t
differences
.
commit
|
commitdiff
|
tree
2013-01-18
lgoubet
[
3
67475] Take git specificities i
n
to account when resolving
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
R
e
naming Resour
c
eT
r
aversal into
StorageTravers
a
l to
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
Di
s
p
lay a pr
o
per name fo
r
the references when t
h
e diff
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
information returned if
the
logical
m
odel resolu
t
i
o
n
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
l
g
o
ubet
Use the same
e
llision for
Attrib
u
te a
n
d reference labels
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
Proper
l
y display difference tha
t
ar
e
not dir
e
ctly
r
efin
e
d
commit
|
commitdiff
|
tree
2012-10-22
lg
o
ubet
Preve
n
t m
e
rgi
n
g towards the
g
it index (o
r
other remote
.
.
.
commit
|
commitdiff
|
tree
2012-10-22
lgou
b
et
L
ower the number of threads
: our
bottlen
e
ck is the
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
W
h
en restructu
r
in
g
the match model
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
Th
i
s has no
t
h
i
ng to do as package visibl
e
commit
|
commitdiff
|
tree
2012-10-19
lgoube
t
Make ResourceTraversal, ResourceUtil an
d
StorageURICon
v
er
t
er
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
Load
the right versions of
t
he distant files
.
commit
|
commitdiff
|
tree
2012-10-19
lgoube
t
The
U
I sho
u
ld
u
s
e post process
o
rs
commit
|
commitdiff
|
tree
2012-10-19
lgo
u
be
t
avoid do
u
ble scheme
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
Always preven
t
lo
a
d
:
ecor
e
ten
d
s to load
n
ew resources
.
.
.
commit
|
commitdiff
|
tree
2012-10-15
l
g
oub
e
t
Le
a
v
e the poss
i
b
i
l
ity for sub
-
classe to not hav
e
a
.
.
.
commit
|
commitdiff
|
tree
2012-10-15
l
g
o
u
bet
Suppressing unavoidable
warning
commit
|
commitdiff
|
tree
2012-10-15
lgo
u
bet
Commenting, and redu
c
i
n
g the nesting count of getDELOrigi
n
V
a
.
.
.
commit
|
commitdiff
|
tree
next