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
Add nightly publication script for JIRO
2021-02-23
lgo
u
b
et
Add nightly publi
c
ation script
for JI
R
O
commit
|
commitdiff
|
tree
2021-02-23
l
goubet
Open
r
anges to acce
p
t Guava 30
.
1
commit
|
commitdiff
|
tree
2021-02-08
lgou
b
et
Bump version to
3
.
3
.
14
commit
|
commitdiff
|
tree
2021-02-08
lgoubet
Do not c
l
ose the reposito
r
y when
creat
i
ng th
e
EMF m
e
rge
.
.
.
commit
|
commitdiff
|
tree
2021-01-05
lgoubet
Pote
n
tial NPE
commit
|
commitdiff
|
tree
2020-11-24
lgoubet
Make
s
ure
f
older
s
are c
r
eated when extrac
t
in
g
input
.
.
.
commit
|
commitdiff
|
tree
2020-11-20
lgoub
e
t
B
u
mp
versi
o
ns t
o
3
.
3
.
13
commit
|
commitdiff
|
tree
2020-11-19
lgou
b
et
D
o
not c
l
o
se th
e
rep
o
sitor
y
, getRepositoryCache
(
)
.
clear
.
.
.
commit
|
commitdiff
|
tree
2020-10-21
lgoubet
Allo
w
loadin
g
of mode
l
s us
i
n
g ID
a
t
t
ributes
fo
r
comparison
commit
|
commitdiff
|
tree
2020-10-21
l
g
oubet
Compatibility re
c
ent mockito
commit
|
commitdiff
|
tree
2020-10-04
lgoubet
O
nly
c
o
nsi
d
er files we've
e
xtracted as potential t
e
s
t
.
.
.
commit
|
commitdiff
|
tree
2020-08-31
lgoubet
D
elete sub-projects first when clea
n
in
g
up test worksp
a
ce
commit
|
commitdiff
|
tree
2020-07-22
lgoub
e
t
Bump Versions
to
3
.
3
.
12
commit
|
commitdiff
|
tree
2020-07-22
lgoubet
Fix n
a
me o
f
2019-12
target platform
commit
|
commitdiff
|
tree
2020-06-26
lgoubet
Fix GitTes
t
Support
commit
|
commitdiff
|
tree
2020-05-26
lgoube
t
B
ump version
s
to 3
.
3
.
11
commit
|
commitdiff
|
tree
2020-04-21
lgoub
e
t
Git t
e
st f
r
amework
f
aili
n
g on windo
w
s
commit
|
commitdiff
|
tree
2020-01-14
lgou
b
et
Bump updat
e
sites to 3
.
3
.
10
commit
|
commitdiff
|
tree
2020-01-14
l
g
oube
t
B
ump
E
MF Compare to 3
.
3
.
1
0 and add 2019-1
2
target platform
commit
|
commitdiff
|
tree
2020-01-06
lgoube
t
P
rev
e
nt NPE from the closing of
a Comparison Dialog
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
Compatibility with JGit 5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lgoube
t
Poten
t
ial NPE whe
n
switch
i
ng
f
i
les in the comp
a
re d
i
alog
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
Switch EMF
C
ompare to Guava 27
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
R
e-e
n
able
s
i
g
ning and tycho
-
p2-plugin,
s
witch website
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lgoub
e
t
B
u
ild testing - disab
l
e ty
c
ho-p2-plugin
commit
|
commitdiff
|
tree
2019-09-25
lgoub
e
t
Buil
d
testing -
d
i
s
able
ec
l
ip
s
e jarsigner
commit
|
commitdiff
|
tree
2019-09-24
l
g
o
ubet
EMF Com
p
a
re documentat
i
on jar i
s
uns
i
g
n
e
d
commit
|
commitdiff
|
tree
2019-09-19
l
g
o
u
bet
Replace Guava
w
ith Jav
a
8
commit
|
commitdiff
|
tree
2019-09-19
lgo
u
bet
Potentia
l
r
ac
e
cond
i
tion
w
hen
loadi
n
g EPackages for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Potenti
a
l NP
E
with
s
o
m
e implementations of
t
he pr
o
perty
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lg
o
u
b
et
S
ome
i
mpleme
n
tations
o
f Resource
.
Diagn
o
stic may return
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lg
o
ubet
EMF Compare
does
n
ot
suppo
r
t relative
x
s
i
:schemaLocation
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoub
e
t
API co
m
patibility
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Remove part of g
u
ava
uses
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Bump to 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
l
g
o
u
b
e
t
Open the
compare navigatable a
s
internal API
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Register the navigatable so th
a
t
t
h
e toolbar
a
ction
s
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
l
g
o
u
b
e
t
Th
e
n
a
vigatable's c
a
che needs to be
cleare
d
when we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
l
goubet
The MatchEngineFa
c
tory doesn't make use
o
f its sette
r
s
commit
|
commitdiff
|
tree
2019-09-16
lgoub
e
t
H
a
ppy c
h
ec
k
style
commit
|
commitdiff
|
tree
2019-09-11
lgoubet
Up
d
ate se
t
up
file
commit
|
commitdiff
|
tree
2019-09-10
lg
o
ubet
T
a
rget platf
o
rm b
a
sed o
n
2019-06
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Behavior change in
2
019-0
6
- Exceptions are now in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgoubet
Remove
t
he 32 bit platforms for our target configurat
i
ons
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
In
d
ex issue when merging no
n
-uniqu
e
attributes' e
l
ements
commit
|
commitdiff
|
tree
2019-09-06
lgoube
t
D
i
ffs dep
e
nding
on pseudo-con
f
licts
do no
t
reject
the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgou
b
et
MOVE d
i
f
f
erenc
e
s
a
l
s
o
nee
d
to tak
e
into account the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Inaccurate conflict detection f
o
r moves in no
n
-containmen
t
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoub
e
t
Moves with non-uniqu
e
values and addit
i
on/deletions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
l
g
oubet
Only
M
OVE
d
iffs need t
o
be
ignored
when
c
omputing the
L
CS
commit
|
commitdiff
|
tree
2019-09-04
lg
o
u
b
et
Conflict detection on i
n
dex changes mu
s
t tak
e
Featu
r
eFi
l
ter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Make
s
ure th
e
UI wo
n
'
t
t
ry to compute
t
h
e
LCS
f
or huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
l
g
o
u
bet
Th
e
"accept/
r
eject" all non-conflic
t
ing action
s
houldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
Fix
d
iff, confli
c
t detecti
o
n
and me
r
ging
o
f non-u
n
ique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
l
gou
b
e
t
P
otenti
a
l o
u
t of bounds exception
commit
|
commitdiff
|
tree
2019-08-27
lgoubet
Com
p
atibilit
y
wi
t
h j
g
it 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
Perfor
m
ance - u
s
e D
i
f
fCrossReferencer w
h
en poss
i
ble
commit
|
commitdiff
|
tree
2019-08-22
lgo
u
b
e
t
regression - right-
c
lick actions on
s
i
n
g
le di
f
f s
e
lection
s
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Open S
M
V API to allo
w
impleme
n
te
r
s to a
c
cess t
h
e raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Prevent
s
e
xce
p
t
io
n
s fr
o
m being
t
h
r
own
from the viewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
Performance
-
u
se
s
treams instead of guav
a
iter
a
tions
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
Performan
c
e - remove use
l
ess guava transfo
r
matio
n
commit
|
commitdiff
|
tree
2019-07-17
lgoubet
Fix detect
i
on of p
s
eu
d
o conflicts on single-va
l
ued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
Regre
s
sion on the gr
o
u
p
/match
right-click
actions in SMW
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Pro
p
erly describe what the conflict
r
esol
v
ing ac
t
io
n
s
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Add StructureMergeViewer
cus
t
omizati
o
n op
t
ions
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
S
hortcut the UMLPostProcessor's subs
e
t implica
t
ions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Prevent NPE from o
v
erriden Resource
implementation
s
commit
|
commitdiff
|
tree
2019-07-16
lgoube
t
Ig
n
o
re "originalTar
g
e
t
O
bjects" from the
E
MF
Compare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgoubet
Bump version
s
to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgoubet
Adapt
tests to EG
i
t
c
h
a
nge of
behavior
commit
|
commitdiff
|
tree
2019-05-29
l
g
oubet
E
n
able
users to merge all confli
c
ts at o
n
ce through
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgo
u
bet
Merging single-valued containme
n
t
c
han
g
es can lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Typos
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
P
revent LCS computatio
n
when we do not
n
eed or
d
er
i
ng
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgoubet
Prevent
du
p
licate insertion points to be sho
w
n in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgou
b
e
t
Prevent CMV disposal when
u
s
er selects multipl
e
e
l
e
m
ents
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgoubet
Only ad
d
n
e
w
ad
a
pters
when need
e
d
commit
|
commitdiff
|
tree
2019-04-14
lgoubet
I
t
e
r
a
te over the dif
f
er
e
nces i
n
s
t
ead of the
matche
s
commit
|
commitdiff
|
tree
2019-04-09
l
g
oubet
Prevent OutOfMe
m
ory
E
rrors from the UI when switching
C
MV
commit
|
commitdiff
|
tree
2019-04-08
lgoub
e
t
Performan
c
e
- Computing requir
e
ment
s
time
s
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
The
UML tests shouldn't use a cached inst
a
nce of
E
MFCompare
commit
|
commitdiff
|
tree
2019-04-03
lgo
u
bet
Restore
p
o
s
sibility to r
e
move
merge
r
s fro
m
the registry
commit
|
commitdiff
|
tree
2019-03-22
lgoubet
Make sure we hook t
h
e
U
I when users prov
i
de a precompu
t
ed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Bump EMF Comp
a
re to 3
.
3
.
7 in prepa
r
ation for
2
0
19-06
commit
|
commitdiff
|
tree
2019-03-21
l
goubet
Di
s
posing
of t
h
e
c
ompar
i
s
o
n shouldn
'
t be done by the SMV
commit
|
commitdiff
|
tree
2019-03-04
lgou
b
et
Avoid ClassCas
t
E
x
ceptio
n
when merging
f
e
ature
map changes
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Bump vers
i
ons for
3
.
3
.
6 for 2019-03
commit
|
commitdiff
|
tree
2019-02-26
lgoube
t
pa
t
ch ModelG
i
tMe
r
ge
E
ditorInput f
o
r
EGit 5
.
3
.
0
c
o
mpatibili
t
y
commit
|
commitdiff
|
tree
2019-02-26
lgou
b
et
S
u
ppress gua
v
a nested
c
onca
t
en
a
tions
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Remove acc
i
dental use of G
u
ava
commit
|
commitdiff
|
tree
2019-02-11
lgoub
e
t
SWTException
when
s
witching comparisons in a c
o
m
pare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Allow cli
e
nts to
prov
i
de pre-computed co
m
parisons to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
lgoubet
Ignore
fai
l
in
g
g
i
t
t
ests for n
o
w
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Bump versions to 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgo
u
bet
Use a released version
of Sir
i
us
commit
|
commitdiff
|
tree
2018-11-30
lgoubet
[541730
]
Reve
r
ts d59c924 du
e
to an UI
f
r
eeze
commit
|
commitdiff
|
tree
2018-06-22
l
goubet
bu
m
p feature versions
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bump versions
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
EMF Compare is no lon
g
er comp
a
tible with egit < 4
.
2
commit
|
commitdiff
|
tree
next