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
[doc] update User Guide: Change download page link.
2020-01-14
lgoubet
Bu
m
p update
s
ites to 3
.
3
.
10
commit
|
commitdiff
|
tree
2020-01-14
l
goubet
Bump E
M
F Compare
to
3
.
3
.
10 and add
2019-
1
2
t
a
rget p
l
atform
commit
|
commitdiff
|
tree
2020-01-06
lg
o
ubet
Prevent
N
PE
from
th
e
closing
o
f a C
o
mparison
Dialog
commit
|
commitdiff
|
tree
2020-01-06
lgo
u
bet
Compat
i
bility w
i
t
h
JGit 5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lgo
u
bet
P
ot
e
nti
a
l NPE when switching files in the
compare
di
a
log
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
Switch EMF
C
om
p
are to
G
uava 27
commit
|
commitdiff
|
tree
2019-09-25
lg
o
ubet
Re-enable sign
i
ng and
t
y
c
ho-p2-plugin, switch w
e
b
site
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Build te
s
ting - d
i
sable tycho-p2-plu
g
in
commit
|
commitdiff
|
tree
2019-09-25
lg
o
ubet
B
u
ild testing - di
s
able eclipse jarsigner
commit
|
commitdiff
|
tree
2019-09-24
l
goubet
EMF Compare documentati
o
n
j
ar
i
s unsigned
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Repla
c
e
Guava w
i
th
J
ava 8
commit
|
commitdiff
|
tree
2019-09-19
lgoube
t
P
o
tentia
l
r
ace condition whe
n
loading EPackage
s
fo
r
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Potential
N
PE wit
h
some implementat
i
o
n
s
o
f
the p
r
ope
r
ty
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lg
o
ubet
Some imp
l
ement
a
tions
o
f Resou
r
ce
.
Diagnosti
c
may return
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
EMF Compare
d
oes
n
ot support re
l
ati
v
e xsi:schemaLocation
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgo
u
bet
API compatibility
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Re
m
ove p
a
rt
of guava us
e
s
commit
|
commitdiff
|
tree
2019-09-18
lgou
b
et
Bump t
o
3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
l
gou
b
et
Op
e
n the co
m
pare
n
avigatabl
e
as
i
nternal API
commit
|
commitdiff
|
tree
2019-09-18
lgo
u
bet
Register the navig
a
tab
l
e so that the toolbar actions
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
l
goubet
The
navigatable
'
s
cache needs
to be
c
leared when w
e
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lgoub
e
t
The MatchEngineFactory doesn't
m
ake us
e
of
i
ts setters
commit
|
commitdiff
|
tree
2019-09-16
lgou
b
et
H
ap
p
y
c
he
c
ks
t
yl
e
commit
|
commitdiff
|
tree
2019-09-11
lgoub
e
t
Update setup file
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Tar
g
et plat
f
orm base
d
on
2
019-06
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Behav
i
or chang
e
in 2019-06 - Exc
e
ptions ar
e
now in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgoubet
Remove the 32 bit platforms for
o
ur ta
r
get configurations
commit
|
commitdiff
|
tree
2019-09-06
lgou
b
et
Ind
e
x iss
u
e wh
e
n mer
g
ing
n
on-unique
attributes' elements
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Diffs de
p
en
d
ing
o
n pseudo-conflict
s
d
o
not rej
e
ct the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
MOVE
d
i
f
f
erences also
need to take
i
nto account the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgo
u
bet
In
a
ccurate con
f
lict dete
c
ti
o
n for moves in non-con
t
ainment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lg
o
ubet
Moves with non-unique values and addition/
d
eletio
n
s
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgo
u
bet
On
l
y
M
OVE dif
f
s need to be ignored when
comput
i
ng the LCS
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Conflict d
e
tection
o
n index chang
e
s m
u
st take
F
eatureFilter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lg
o
ubet
Make s
u
re
t
h
e
UI won't try
t
o c
o
mp
u
te the LCS for huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoub
e
t
T
h
e
"
a
c
ce
p
t
/reje
c
t" all
n
on-conflicting a
c
tio
n
shoul
d
n
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
l
goub
e
t
Fix diff, conflict detection and merging of non-uniq
u
e
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoub
e
t
Potenti
a
l o
u
t of
b
o
unds exception
commit
|
commitdiff
|
tree
2019-08-27
lgo
u
bet
Compatibi
l
ity
w
ith jgit
5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
Performan
c
e - use
D
iffCrossReferen
c
er when poss
i
ble
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
regress
i
on - ri
g
ht-click actions on
s
in
g
l
e diff selection
s
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
l
g
oubet
Open SMV API to allow
i
mple
m
enters to
a
c
c
ess t
h
e ra
w
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Prevents exceptions from bei
n
g thro
w
n from the viewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoub
e
t
Per
f
ormance - us
e
str
e
am
s
instead of guava iterat
i
on
s
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoub
e
t
Performance
- remove us
e
less gu
a
va tra
n
sformation
commit
|
commitdiff
|
tree
2019-07-17
lgoube
t
F
i
x detection of pseudo confl
i
cts on si
n
gle
-
v
alued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgou
b
e
t
Reg
r
essi
o
n on the
gr
o
up/matc
h
r
ight-c
l
ick actions in SMW
commit
|
commitdiff
|
tree
2019-07-16
lgo
u
bet
Proper
l
y de
s
c
r
ibe what the co
n
flict resolv
i
ng actions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Add S
t
ructureMe
r
geViewer customization options
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Shortcut
t
he UMLPostP
r
ocessor's subset implication
s
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
goubet
P
revent NPE
from
o
ver
r
iden Re
s
o
urce implem
e
ntations
commit
|
commitdiff
|
tree
2019-07-16
l
g
o
u
b
et
Ignor
e
"or
i
g
i
n
alTarge
t
Obje
c
ts
"
f
r
om th
e
E
M
F
Compare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgoubet
B
ump versions to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgoubet
Adapt tests to EGit chan
g
e of behavior
commit
|
commitdiff
|
tree
2019-05-29
lgoube
t
E
nable use
r
s t
o
merge all conflicts at
once thro
u
gh
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Merging single-v
a
lued c
o
n
t
a
i
n
m
e
n
t changes ca
n
lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
l
goubet
Typos
commit
|
commitdiff
|
tree
2019-05-23
lgoub
e
t
Prevent LCS computation wh
e
n we do not need order
i
ng
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgoubet
Prevent dup
l
ic
a
te inse
r
ti
o
n
poi
n
ts to be sho
w
n in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgoubet
P
r
event CMV dis
p
os
a
l
when user selects multi
p
le elem
e
nts
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
l
gou
b
et
Only
add ne
w
a
dap
t
ers when needed
commit
|
commitdiff
|
tree
2019-04-14
lgoubet
Itera
t
e
o
ver the differences instead of the matches
commit
|
commitdiff
|
tree
2019-04-09
lgou
b
et
P
r
e
vent Ou
t
OfMemoryErrors from the UI when switching CMV
commit
|
commitdiff
|
tree
2019-04-08
lg
o
ube
t
Perfo
r
mance
-
Computing
r
equirements times
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
The UML
t
ests shouldn't
use a ca
c
hed
i
nstance of EMFC
o
m
pare
commit
|
commitdiff
|
tree
2019-04-03
lgoubet
R
e
st
o
re poss
i
bility t
o
rem
o
ve mergers fr
o
m the
registry
commit
|
commitdiff
|
tree
2019-03-22
lgoubet
Make sure we
hook the UI when
users provide
a p
r
ecomputed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgoub
e
t
Bump EMF
C
ompare to 3
.
3
.
7
in pr
e
p
a
r
a
t
i
o
n for 2019-06
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
D
i
s
posing of the com
p
arison sh
o
uld
n
't be don
e
by the S
M
V
commit
|
commitdiff
|
tree
2019-03-04
l
g
oubet
Avoid
ClassCastExc
e
ption when m
e
r
gi
n
g fea
t
ure map changes
commit
|
commitdiff
|
tree
2019-02-26
lgoube
t
Bump v
e
r
sions
f
or 3
.
3
.
6
f
or 2019-03
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
p
a
t
ch Mo
d
elGitMer
g
eEdito
r
In
p
ut
f
o
r
EGit 5
.
3
.
0 compatibi
l
i
ty
commit
|
commitdiff
|
tree
2019-02-26
lgoube
t
S
uppress
guava
nes
t
ed concatenations
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Remove accide
n
t
al u
s
e
o
f G
u
ava
commit
|
commitdiff
|
tree
2019-02-11
lg
o
u
bet
S
W
T
Exc
e
ption wh
e
n switchi
n
g
compa
r
is
o
ns in a compare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgou
b
et
Allo
w
clien
t
s
t
o
provide pre
-
computed compa
r
isons to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
lgoub
e
t
I
gnor
e
failing git tests fo
r
now
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
B
ump versi
o
ns
to 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Use
a
released version of S
i
rius
commit
|
commitdiff
|
tree
2018-11-30
lgou
b
et
[
5
41
7
30] Rev
e
rts d59c924 due to an UI freeze
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bump
feature
vers
i
on
s
commit
|
commitdiff
|
tree
2018-06-22
l
goubet
bump versions
commit
|
commitdiff
|
tree
2018-06-22
lgoub
e
t
EMF Compare is no longer compatible with egit <
4
.
2
commit
|
commitdiff
|
tree
2018-06-05
lgo
u
bet
Intro
d
uce test
for me
r
ge
s
w
i
th multiple ancestors
commit
|
commitdiff
|
tree
2018-03-13
lgoubet
Removing the subversive int
e
gration plugins
commit
|
commitdiff
|
tree
2018-01-30
lgoubet
Bump
plugin and fe
a
ture versions fo
r
Photon
commit
|
commitdiff
|
tree
2018-01-24
lgoubet
Removing the Papyrus
plugins a
n
d
feature
s
f
r
o
m
the
.
.
.
commit
|
commitdiff
|
tree
2013-07-12
lgoubet
[410737
]
p
res
e
rve order
i
ng
e
ve
n
fo
r
equi
v
al
e
nt
d
ifferences
.
commit
|
commitdiff
|
tree
2013-01-18
l
g
oubet
[367475] Take git
s
pecif
i
cities into ac
c
ount when res
o
l
v
ing
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
lgoub
e
t
R
en
a
m
ing
Resou
r
ceTraversal int
o
Storag
e
Traversal to
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
D
i
splay a
p
r
o
per n
a
me for the reference
s
when the diff
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
informa
t
io
n
r
e
turn
e
d if the
logical model
r
esol
u
tio
n
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
lgoub
e
t
Use the same ellision for Attribut
e
and r
e
ference labels
commit
|
commitdiff
|
tree
2012-10-31
lgo
u
bet
P
roperly
display
d
ifference that are not
directly refine
d
commit
|
commitdiff
|
tree
2012-10-22
lgoubet
Prevent merging t
o
w
ards the git index (or oth
e
r re
m
ote
.
.
.
commit
|
commitdiff
|
tree
2012-10-22
lgoubet
Lower the nu
m
ber of
t
h
r
eads : our bott
l
eneck is the
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lgou
b
et
W
h
e
n
re
s
tr
u
cturing the m
a
tch model
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
This
has no
t
hing to do a
s
pa
c
kage
visible
commit
|
commitdiff
|
tree
2012-10-19
lgou
b
et
Make Resour
c
eTraversa
l
,
R
e
sourceUtil and
S
torageURIConverter
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
l
g
o
ube
t
L
o
ad
t
h
e
right versions of the distant
files
.
commit
|
commitdiff
|
tree
next