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
R
e
-enable signing and
tycho-p2-plugin, swit
c
h
webs
i
te
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
B
u
ild testing - disa
b
le tyc
h
o-p2-plugin
commit
|
commitdiff
|
tree
2019-09-25
lgou
b
et
B
u
ild testing -
disable eclipse jarsigner
commit
|
commitdiff
|
tree
2019-09-24
lgoubet
EM
F
Compare doc
u
men
t
ation jar is unsigned
commit
|
commitdiff
|
tree
2019-09-19
lgoube
t
Replace
Guava with Java 8
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Potential ra
c
e
con
d
ition whe
n
loading EPackag
e
s for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgo
u
bet
Po
t
ential NPE with
s
ome implem
e
ntations of the pro
p
erty
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
l
g
oubet
Som
e
implementations of Re
s
o
urce
.
Diagnosti
c
may re
t
urn
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoube
t
EMF Compare does not support relat
i
ve xsi:schemaLocation
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
API
c
ompatibilit
y
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Remove p
a
rt of guav
a
uses
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Bump to
3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
l
goube
t
Op
e
n th
e
c
o
mp
a
re nav
i
gatable as in
t
ernal API
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Register
t
h
e na
v
igat
a
ble so that the t
o
olba
r
actions
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
l
g
oubet
T
h
e navigatable's
cache nee
d
s to be cle
a
red whe
n
we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
l
g
oubet
The MatchEngineFactory
doesn't make use of i
t
s s
e
tte
r
s
commit
|
commitdiff
|
tree
2019-09-16
l
g
o
u
bet
Ha
p
py check
s
tyle
commit
|
commitdiff
|
tree
2019-09-11
lgoube
t
Update s
e
tup file
commit
|
commitdiff
|
tree
2019-09-10
lg
o
ubet
Target plat
f
orm
b
ased on 2019-0
6
commit
|
commitdiff
|
tree
2019-09-10
l
goubet
B
e
h
a
vior cha
n
ge
in 2019-06
- Except
i
ons are now in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
l
g
oubet
Remove the 32 bi
t
p
l
atforms f
o
r our ta
r
get c
o
n
f
igurati
o
n
s
commit
|
commitdiff
|
tree
2019-09-06
lgou
b
et
Index iss
u
e
when me
r
ging
n
on
-
unique a
t
tributes'
e
lements
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Dif
f
s depe
n
ding on pseudo
-
confli
c
ts do not reject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
MOVE
d
ifferences also need t
o
take
i
n
t
o account the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoub
e
t
I
n
accu
r
at
e
conflic
t
d
etecti
o
n for moves in non-containment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
l
goubet
Moves w
i
th non-u
n
ique values and addition/del
e
tions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgou
b
e
t
Onl
y
MOVE diffs need
t
o b
e
ignored whe
n
computing
the LCS
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Conf
l
i
c
t de
t
ection on index changes must
take
F
eatu
r
eF
i
lter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgou
b
et
Make sure the UI w
o
n't try to compute the LCS for
huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
l
g
oubet
The "acce
p
t
/
r
e
j
ect"
a
ll non-conflicting
a
ction
shouldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
Fix diff, c
o
nflict detection and
m
e
rg
i
n
g
of
n
on-unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoubet
Potential o
u
t of bounds excepti
o
n
commit
|
commitdiff
|
tree
2019-08-27
lgoube
t
Compatibility with jgit 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
l
goubet
Perfor
m
ance
- u
s
e DiffCrossReferencer when po
s
s
ible
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
regr
e
s
sion
-
rig
h
t-click actions on
s
ingle diff selections
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Open SMV
API to allow implementers to acce
s
s the raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoub
e
t
Prevents e
x
cep
t
io
n
s from
being thro
w
n
f
r
om
t
h
e vie
w
e
r
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoub
e
t
Perf
o
rmance -
use stream
s
i
nstead
o
f
guava it
e
rations
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
l
goubet
P
e
rf
o
r
m
ance - remove us
e
less guava transforma
t
ion
commit
|
commitdiff
|
tree
2019-07-17
lgoub
e
t
F
ix dete
c
tion
o
f pseudo co
n
fli
c
ts on single
-
valued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoub
e
t
R
e
gression on the group/match right-click actions
i
n SMW
commit
|
commitdiff
|
tree
2019-07-16
lgo
u
bet
Prope
r
ly descr
i
b
e
w
ha
t
th
e
c
onflict resolving act
i
ons
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
g
oubet
Add
S
tructureM
e
r
geVi
e
w
er
customization
options
commit
|
commitdiff
|
tree
2019-07-16
l
goubet
Short
c
ut the
U
MLPostProcessor
'
s subset implications
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoube
t
Prev
e
n
t
NPE f
r
om
o
v
e
rri
d
en R
e
sour
c
e i
m
pl
e
mentati
o
ns
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
Ig
n
ore "originalTargetObjects"
f
rom the EMF Compare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgou
b
et
Bum
p
vers
i
on
s
to
3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
l
goube
t
Adapt t
e
sts to EGi
t
c
h
ange of b
e
h
a
vior
commit
|
commitdiff
|
tree
2019-05-29
lgoubet
Enable users t
o
m
e
rge
all c
o
nflicts at once
t
hroug
h
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgo
u
bet
M
e
rgin
g
sing
l
e-va
l
ued cont
a
i
n
ment chan
g
e
s
can lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
l
g
oubet
Typos
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
P
r
event LCS
c
omp
u
t
a
tion when we
do no
t
nee
d
or
d
ering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgo
u
be
t
Prevent
d
u
plicate inserti
o
n points t
o
be
s
ho
w
n in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
l
goubet
Prevent CMV disposal when user se
l
ect
s
multiple e
l
ements
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgoubet
Only ad
d
new adapters when need
e
d
commit
|
commitdiff
|
tree
2019-04-14
lgo
u
bet
I
t
erate ov
e
r the differences instead
o
f the matches
commit
|
commitdiff
|
tree
2019-04-09
lgoubet
Prevent
OutOfM
e
moryErrors from the UI when swit
c
hin
g
CMV
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
Perfo
r
mance - Computing requi
r
e
ments
times
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
The
UML tests sho
u
ldn't
u
se a c
a
ched insta
n
ce
o
f E
M
FCompare
commit
|
commitdiff
|
tree
2019-04-03
lgoubet
Restore p
o
s
sibi
l
ity to remove merg
e
r
s f
r
om the regist
r
y
commit
|
commitdiff
|
tree
2019-03-22
l
g
oubet
M
ake sure we hook t
h
e UI when users
pr
o
vide
a
preco
m
puted
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgoube
t
Bump EMF Compare
t
o 3
.
3
.
7
i
n preparation
f
or 2019-06
commit
|
commitdiff
|
tree
2019-03-21
lgou
b
et
Dis
p
osing
o
f the comparison
shou
l
dn't be done by th
e
SMV
commit
|
commitdiff
|
tree
2019-03-04
lgoube
t
Avoid ClassCas
t
E
xc
e
ption when me
r
ging feature map cha
n
ges
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Bump
v
e
r
s
i
ons fo
r
3
.
3
.
6 for 2019-0
3
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
pat
c
h ModelGitMer
g
eEditorInput
fo
r
EGit 5
.
3
.
0 compatibilit
y
commit
|
commitdiff
|
tree
2019-02-26
lgoub
e
t
Suppress g
u
ava ne
s
ted co
n
catenations
commit
|
commitdiff
|
tree
2019-02-11
lgo
u
bet
Remove a
c
cidental use of Guav
a
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
SWTExce
p
t
i
o
n wh
e
n switching
comparison
s
in
a
compa
r
e
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Allow clients to pr
o
vide pre-com
p
uted compariso
n
s to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
lgoubet
I
gnore failing
g
i
t
t
e
sts for now
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Bu
m
p
v
ersions
t
o 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lg
o
ubet
U
s
e a released ver
s
ion of
Sirius
commit
|
commitdiff
|
tree
2018-11-30
l
goubet
[5417
3
0] Revert
s
d5
9
c924 due to an UI fr
e
eze
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bump
f
eature version
s
commit
|
commitdiff
|
tree
2018-06-22
lgou
b
et
bump versions
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
EMF Compar
e
is no longer
compatible wit
h
e
g
i
t < 4
.
2
commit
|
commitdiff
|
tree
2018-06-05
lgoube
t
I
n
tro
d
uce te
s
t for
m
erges
with
m
u
ltiple anc
e
stors
commit
|
commitdiff
|
tree
2018-03-19
La
u
rent Gou
b
et
Proxy loading from
t
h
e merge tool
commit
|
commitdiff
|
tree
2018-03-16
Lauren
t
Goubet
A
l
low proxy resoluti
o
n fr
o
m the EMF
C
ompare content
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent
G
oubet
Allow
proxy resolution from the E
M
F Compare structur
e
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laur
e
nt Goube
t
SMV a
c
tion to
reveal a
l
l differences
in conflict with
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
La
u
rent Goubet
Add ac
t
ions
t
o
merge everyt
h
ing to
"get right" or
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
Laurent Goubet
No
c
h
an
g
e
s
shown w
h
en there is an ad
d
ed S
i
rius di
a
g
r
am
commit
|
commitdiff
|
tree
2018-03-13
L
aurent
G
o
ub
e
t
Me
m
ory leak
f
rom the EMFM
o
delP
r
ovider
.
con
t
extToResou
r
ceMa
p
pi
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
Laurent Goubet
Memory leaks w
h
en comparing Sirius diagrams
commit
|
commitdiff
|
tree
2018-03-13
lgoubet
Removing the subversive
i
n
tegration
plug
i
ns
commit
|
commitdiff
|
tree
2018-03-13
Laurent Go
u
bet
XMI files a
r
e not always m
o
dels
commit
|
commitdiff
|
tree
2018-03-13
Lau
r
ent Goubet
Memory
l
e
ak dur
i
ng automatic merge opera
t
ions f
r
om
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
L
a
urent Goubet
D
o
n
't return null from ITypedE
l
ement
.
getName()
.
commit
|
commitdiff
|
tree
2018-03-12
L
aurent Go
u
bet
[532069] In
v
alid logica
l
m
odel for Synchron
i
ze with
.
.
.
commit
|
commitdiff
|
tree
2018-01-30
lgoubet
Bump
plugi
n
a
nd feature ve
r
sion
s
f
o
r P
h
oton
commit
|
commitdiff
|
tree
2018-01-24
lgoubet
R
emoving the Pa
p
yru
s
plugins a
n
d
featu
r
es fr
o
m
t
he
.
.
.
commit
|
commitdiff
|
tree
2017-10-09
Lau
r
ent Gou
b
e
t
API break in
J
Git 4
.
9
due to t
h
e fix f
o
r bug 5
1
7
1
28
commit
|
commitdiff
|
tree
2017-09-08
Laur
e
nt
G
oubet
[
510420] Adding mis
s
ing exte
n
s
i
on
point def
i
niti
o
ns
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Laur
e
n
t Goube
t
[515591]
T
ry
a
nd fix random te
s
t failures
commit
|
commitdiff
|
tree
2017-09-07
L
a
urent Goub
e
t
per
f
orman
c
e plugin issues
commit
|
commitdiff
|
tree
2017-08-31
Laurent Goubet
[521358]
documen
t
at
i
on f
o
r EMFCompareRC
P
Plugin
m
i
ss
i
ng
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Laur
e
nt Goubet
Bump
i
ng versions for Oxygen
.
1
commit
|
commitdiff
|
tree
2017-08-23
L
a
ure
n
t Goubet
Removing non functional
p
r
o
files from pom
commit
|
commitdiff
|
tree
next