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
l
goube
t
B
u
mp versions
t
o
3
.
3
.
11
commit
|
commitdiff
|
tree
2020-04-21
lgoubet
Git
test framework fai
l
i
n
g on windows
commit
|
commitdiff
|
tree
2020-01-14
lgoubet
Bump update sites to
3
.
3
.
10
commit
|
commitdiff
|
tree
2020-01-14
lgoubet
Bum
p
E
MF Compare
t
o 3
.
3
.
10 and add 2019-
1
2 target pla
t
form
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
Prev
e
nt N
P
E from the
closing of a
Comparison
D
ialog
commit
|
commitdiff
|
tree
2020-01-06
lgoube
t
C
o
mpa
t
ib
i
li
t
y with J
G
it
5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
Pote
n
tial NPE wh
e
n switching fil
e
s in the compare dialog
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
Switch EMF Compare to Guava 27
commit
|
commitdiff
|
tree
2019-09-25
lgou
b
et
Re-e
n
abl
e
signing a
n
d ty
c
ho
-
p2-plugin, switch web
s
i
t
e
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
B
uil
d
t
estin
g
- disabl
e
tycho-p2-p
l
ugin
commit
|
commitdiff
|
tree
2019-09-25
lgou
b
et
Build testing - disable eclip
s
e
jarsigner
commit
|
commitdiff
|
tree
2019-09-24
l
g
oubet
EM
F
Co
m
p
are do
c
umentati
o
n jar is u
n
signed
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Repl
a
ce
G
uava with
Jav
a
8
commit
|
commitdiff
|
tree
2019-09-19
lgou
b
et
Potential race c
o
ndit
i
on whe
n
l
oading EPackages for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
P
o
tenti
a
l
NPE wit
h
some imple
m
entations
o
f
the
p
roperty
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
l
goubet
Some
i
m
p
lementa
t
ions of Resource
.
Diagnostic ma
y
retu
r
n
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lg
o
ub
e
t
E
M
F C
o
mpa
r
e does not supp
o
rt rel
a
tive xs
i
:s
c
hemaLocati
o
n
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
l
g
oubet
API compat
i
bility
commit
|
commitdiff
|
tree
2019-09-18
l
g
o
ube
t
Remove part of
guava uses
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Bu
m
p to
3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lgo
u
bet
Open
the comp
a
re navigatable as intern
a
l API
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Regist
e
r the navi
g
atab
l
e so t
h
at the
t
oolbar actions
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lg
o
ubet
The n
a
v
i
gatable's
cache needs to be cleared
w
h
e
n we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lgoub
e
t
The MatchEngineFactory does
n
'
t make use
o
f its s
e
tters
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
Happy checksty
l
e
commit
|
commitdiff
|
tree
2019-09-11
lgoube
t
Update setu
p
file
commit
|
commitdiff
|
tree
2019-09-10
l
g
oubet
Target
p
latform b
a
sed
on 2
0
19-06
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Behavior c
h
ange in
2019-06 - Exceptions a
r
e n
o
w in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgoubet
Remov
e
the 32
b
i
t
platforms
for our
target c
o
nf
i
gurations
commit
|
commitdiff
|
tree
2019-09-06
l
g
o
u
b
et
Index issue
when merging non-unique attribu
t
es' elements
commit
|
commitdiff
|
tree
2019-09-06
lgou
b
e
t
Diffs
d
e
pend
i
ng
o
n
pseu
d
o
-conf
l
icts d
o
n
o
t
r
e
ject
the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
MOVE dif
f
er
e
nces
a
lso
need
t
o
take into account th
e
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lg
o
ube
t
Inaccurate c
o
n
flict de
t
ect
i
on for mo
v
es
in non-
c
ont
a
in
m
ent
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgo
u
bet
Move
s
w
ith non
-
unique values and
a
ddi
t
ion/deletions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lg
o
u
bet
Only MOVE
dif
f
s need to be ign
o
red wh
e
n computing th
e
LCS
commit
|
commitdiff
|
tree
2019-09-04
lgo
u
bet
Confl
i
ct detec
t
ion o
n
index changes must take Feat
u
r
e
F
i
lter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Make sure
t
he UI won't tr
y
to
c
ompute the L
C
S
for huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
The "
a
cce
p
t/
r
eject" all n
o
n-conflic
t
ing actio
n
shouldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
l
goubet
Fix diff, conflic
t
de
t
e
c
tio
n
and merging of non-unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoub
e
t
Potential out of bo
u
nds
exce
p
t
ion
commit
|
commitdiff
|
tree
2019-08-27
lgoubet
Co
m
patibility with
j
git 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
Performa
n
ce - u
s
e DiffCrossReferencer when possible
commit
|
commitdiff
|
tree
2019-08-22
lgoub
e
t
regr
e
ssion - right-
c
lick actions on single dif
f
selections
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgou
b
et
Open SMV API to a
l
l
o
w implementer
s
to acce
s
s the raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgo
u
bet
Prevents e
x
ceptions from being
t
hrown from t
h
e viewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
Perform
a
nce - us
e
streams instead
of guava it
e
rations
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoube
t
Performance - remove u
s
eless guav
a
transf
o
rmation
commit
|
commitdiff
|
tree
2019-07-17
lgoubet
Fix detection of
pseudo conflicts on
s
ingle-val
u
ed
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
g
oubet
Regression on th
e
group/match
r
ight-cli
c
k actions
i
n
S
M
W
commit
|
commitdiff
|
tree
2019-07-16
l
goub
e
t
Pro
p
erly describ
e
what the
conflict resolving
actions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoub
e
t
Add StructureM
e
rgeViewer cus
t
omi
z
at
i
on
options
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Shortcut the U
M
LPo
s
tProcessor'
s
subset
i
mplications
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
g
oubet
Prevent N
P
E
from o
v
e
r
riden Resou
r
ce impleme
n
tations
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Ignore "orig
i
na
l
TargetOb
j
ec
t
s
" from the EMF Compa
r
e
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgoubet
Bump ve
r
sions to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
l
goubet
Ad
a
pt tests
to EGit ch
a
nge of b
e
h
a
vior
commit
|
commitdiff
|
tree
2019-05-29
l
goub
e
t
E
n
able user
s
to
merge all co
n
flicts
a
t
o
nce t
h
rough
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
M
ergin
g
single-
v
alued co
n
t
a
i
n
ment
changes ca
n
lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Ty
p
o
s
commit
|
commitdiff
|
tree
2019-05-23
lgou
b
et
Prevent
L
CS c
o
m
p
u
t
ation when
we do not need
o
rdering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgoubet
P
reven
t
d
u
plicate i
n
ser
t
ion points
t
o
be sh
o
wn in
tr
e
e
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgoub
e
t
Prevent CM
V
di
s
posal when user
selects multipl
e
elements
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgoubet
On
l
y a
d
d n
e
w a
d
a
pters when nee
d
ed
commit
|
commitdiff
|
tree
2019-04-14
lgoubet
Iterate over the differen
c
es
instead of th
e
matches
commit
|
commitdiff
|
tree
2019-04-09
lgoubet
Prevent OutO
f
Me
m
oryErrors from the
UI w
h
en switchi
n
g CMV
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
Performance - Computi
n
g
r
e
quireme
n
ts times
commit
|
commitdiff
|
tree
2019-04-08
l
g
o
ub
e
t
The UML tests s
h
ouldn't u
s
e a cached in
s
t
a
nce
o
f EMFCompa
r
e
commit
|
commitdiff
|
tree
2019-04-03
lgoubet
Restore
possib
i
lity to remove mergers from
t
he registry
commit
|
commitdiff
|
tree
2019-03-22
lgoub
e
t
Ma
k
e sure w
e
h
o
ok the UI
w
hen us
e
rs
provide a
precom
p
ute
d
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
B
ump EMF Compare to 3
.
3
.
7 in prepara
t
ion
f
or
2
01
9
-06
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
D
i
s
p
o
sin
g
of the compar
i
son sh
o
uldn't
be done by the SMV
commit
|
commitdiff
|
tree
2019-03-04
lgoube
t
Avoid Cl
a
ssCas
t
E
x
c
eption when
m
ergi
n
g
f
eature map
changes
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Bump
v
ersions for 3
.
3
.
6
for 2019-
0
3
commit
|
commitdiff
|
tree
2019-02-26
lgoube
t
patch
M
o
delGitMerg
e
EditorInput
f
o
r EGit 5
.
3
.
0 compatibility
commit
|
commitdiff
|
tree
2019-02-26
l
g
oubet
Suppress guav
a
n
ested concate
n
ations
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Remove acc
i
de
n
t
al use of
G
u
ava
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
S
W
TEx
c
eption whe
n
s
w
itc
h
ing comparisons in
a
compare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgo
u
bet
Allow
cli
e
nts
t
o
provide pre-computed com
p
aris
o
ns to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
lgoubet
Ig
n
ore f
a
ili
n
g
git tes
t
s for now
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Bump v
e
rsi
o
ns t
o
3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgo
u
bet
Use
a
released
version
of Sirius
commit
|
commitdiff
|
tree
2018-11-30
lgoube
t
[541730] Reverts d59c924 due to an UI f
r
eeze
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bump feature
vers
i
ons
commit
|
commitdiff
|
tree
2018-06-22
lgo
u
bet
bump ve
r
s
ions
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
E
M
F Co
m
par
e
is no
longer compati
b
le with egit < 4
.
2
commit
|
commitdiff
|
tree
2018-06-05
lgoubet
Introduce test f
o
r
m
erges with multipl
e
ancestors
commit
|
commitdiff
|
tree
2018-03-19
Laurent
Goubet
P
r
oxy loading
f
r
om
t
h
e
m
e
rge
tool
commit
|
commitdiff
|
tree
2018-03-16
L
aurent Goubet
Allow proxy resolution fr
o
m the EMF Compare cont
e
nt
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Lau
r
ent Goube
t
Allow p
r
oxy resolution from the EMF C
o
m
pare struct
u
re
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent Goubet
SMV actio
n
to reveal all differences i
n
confl
i
ct with
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Lau
r
ent Goub
e
t
A
d
d
a
ct
i
ons to merge everything to "get right" or
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
Laurent Goubet
N
o
chang
e
s shown
when
t
here
i
s an
a
dded Sirius diagram
commit
|
commitdiff
|
tree
2018-03-13
Laurent Goube
t
Memory
l
eak f
r
om the
EMFModelProvider
.
c
ontextToReso
u
rceMappi
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
Laurent Goub
e
t
Memo
r
y leaks whe
n
com
p
a
r
ing
Sirius d
i
agrams
commit
|
commitdiff
|
tree
2018-03-13
lgoubet
R
emovi
n
g
t
h
e subversi
v
e integratio
n
plugins
commit
|
commitdiff
|
tree
2018-03-13
Laur
e
nt Goubet
XMI
files are
not always models
commit
|
commitdiff
|
tree
2018-03-13
Laurent Goubet
Memory
l
e
a
k during au
t
omatic me
r
ge
o
perations
from
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
L
a
urent
G
o
u
bet
D
on't return null from I
T
ypedElemen
t
.
getName()
.
commit
|
commitdiff
|
tree
2018-03-12
Lauren
t
Goubet
[532
0
69]
I
nval
i
d
logical model for Synch
r
onize with
.
.
.
commit
|
commitdiff
|
tree
2018-01-30
l
g
oube
t
Bump plug
i
n and feature
versions for Photon
commit
|
commitdiff
|
tree
next