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
lg
o
ubet
Ad
d
nightly pub
l
ication script
f
or JIRO
commit
|
commitdiff
|
tree
2021-02-23
l
g
ou
b
et
O
pen ranges to accept
Guava
30
.
1
commit
|
commitdiff
|
tree
2021-02-08
lgoubet
Bump version t
o
3
.
3
.
14
commit
|
commitdiff
|
tree
2021-02-08
lg
o
ubet
D
o
n
o
t close th
e
reposi
t
ory when
c
reating
the
EMF merge
.
.
.
commit
|
commitdiff
|
tree
2021-01-05
l
goubet
P
otential NPE
commit
|
commitdiff
|
tree
2020-11-24
lgoubet
Make sure
f
olders ar
e
created wh
e
n
e
xtracting
i
nput
.
.
.
commit
|
commitdiff
|
tree
2020-11-20
lgoubet
Bump versions
to 3
.
3
.
13
commit
|
commitdiff
|
tree
2020-11-19
lgoubet
D
o
no
t
clo
s
e
t
he repo
s
itory, getRe
p
ositoryCache()
.
clear
.
.
.
commit
|
commitdiff
|
tree
2020-10-21
lgo
u
be
t
Allow l
o
a
d
ing of model
s
using ID
attri
b
utes
f
or comparison
commit
|
commitdiff
|
tree
2020-10-21
lgoubet
Compatibili
t
y recent mock
i
to
commit
|
commitdiff
|
tree
2020-10-04
l
g
oubet
Only c
o
nsider files we'
v
e extrac
t
ed as po
t
ential test
.
.
.
commit
|
commitdiff
|
tree
2020-08-31
lgoubet
Delete sub-projects
first when
c
leaning up test w
o
rk
s
pac
e
commit
|
commitdiff
|
tree
2020-07-22
lgoubet
Bump
Versions to 3
.
3
.
1
2
commit
|
commitdiff
|
tree
2020-07-22
lgoub
e
t
Fix nam
e
of 2019-12 target platform
commit
|
commitdiff
|
tree
2020-06-26
lgoubet
Fix GitTestS
u
ppor
t
commit
|
commitdiff
|
tree
2020-05-26
lgoubet
Bump ve
r
s
i
ons to 3
.
3
.
11
commit
|
commitdiff
|
tree
2020-04-21
lgoubet
Git test f
r
amework faili
n
g on window
s
commit
|
commitdiff
|
tree
2020-01-14
lgoubet
Bump update sit
e
s to 3
.
3
.
1
0
commit
|
commitdiff
|
tree
2020-01-14
lgoub
e
t
Bump EM
F
Com
p
a
r
e
to
3
.
3
.
10 and add 20
1
9
-1
2
target p
l
atform
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
Prevent NPE from the closi
n
g of a
C
omparison
D
ial
o
g
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
Compatibility with JG
i
t
5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
Po
t
ential NP
E
wh
e
n
s
witching files in
the compare di
a
l
og
commit
|
commitdiff
|
tree
2019-11-05
l
goubet
Swit
c
h EMF Compare to Guava 27
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Re-enable signi
n
g and tycho-p2-plugi
n
, switch website
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lg
o
ubet
B
uild testing
-
d
isable tycho-p2-
p
l
u
g
i
n
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
B
u
ild testing -
d
isable eclipse jarsigner
commit
|
commitdiff
|
tree
2019-09-24
lgoubet
EMF Compare
d
ocumenta
t
ion jar is unsigned
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Rep
l
ace Guava
w
ith J
a
va
8
commit
|
commitdiff
|
tree
2019-09-19
lgou
b
et
Potential
race condition when lo
a
d
ing EPackages for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Pot
e
ntial N
P
E
with some im
p
lementati
o
ns of the
prop
e
rty
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
l
goubet
Some
imp
l
ementation
s
of Resource
.
D
iagn
o
s
t
ic
m
ay return
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoube
t
EM
F
Compare does no
t
support re
l
ative xsi:schemaLocation
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgo
u
bet
A
P
I compat
i
bi
l
ity
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
R
e
move part o
f
g
uava use
s
commit
|
commitdiff
|
tree
2019-09-18
l
go
u
bet
B
u
m
p to 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Open t
h
e compare n
a
v
ig
a
table as
internal
API
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Regist
e
r the navigatable
s
o that t
h
e toolba
r
a
c
ti
o
ns
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lgoubet
The
n
a
viga
t
able's cache needs to be cleared whe
n
we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
l
goubet
The MatchEngineF
a
ctory doesn't make use of its sette
r
s
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
Ha
p
py
c
heckstyle
commit
|
commitdiff
|
tree
2019-09-11
l
g
oubet
Updat
e
s
e
tup file
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Target platform based on
2019
-
06
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Behavior
cha
n
ge in 2019-06 - Exceptions are
now in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgoubet
Remove the 32 b
i
t p
l
a
tforms for our tar
g
et configur
a
tion
s
commit
|
commitdiff
|
tree
2019-09-06
l
goub
e
t
Ind
e
x iss
u
e when merging non-unique attri
b
utes' elemen
t
s
commit
|
commitdiff
|
tree
2019-09-06
l
g
o
ubet
Diff
s
dep
e
nding on pseudo-
c
onflict
s
do not r
e
jec
t
t
he
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
MOV
E
differences
als
o
n
e
ed to
t
ake into account the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgou
b
et
Ina
c
curate confl
i
ct detection for
m
oves in non-contain
m
ent
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoub
e
t
Move
s
w
ith non-unique valu
e
s
and addition/
d
eletion
s
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Only MOVE dif
f
s nee
d
to be ig
n
or
e
d when computing the LCS
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Confli
c
t d
e
tection on index changes must take FeatureF
i
lter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Make sure the UI
w
on't
try to co
m
pute the L
C
S for huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
Th
e
"accept/reje
c
t" all non-conf
l
icti
n
g action
s
houl
d
n
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
l
g
ou
b
et
Fi
x
diff, conflict detection and merging of non-unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
l
goubet
Potential ou
t
of bounds exception
commit
|
commitdiff
|
tree
2019-08-27
l
goubet
C
o
mp
a
tibi
l
ity with j
g
it 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoube
t
Performance - u
s
e DiffC
r
ossReferencer when po
s
sible
commit
|
commitdiff
|
tree
2019-08-22
l
goubet
r
egression
- righ
t
-cl
i
ck act
i
ons on single d
i
ff selections
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Open
S
MV API to allow i
m
pleme
n
ters
t
o a
c
c
ess the raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Pre
v
ents except
i
ons from be
i
ng th
r
own from the viewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
l
g
o
ubet
Performa
n
ce - use streams instead of guava iteration
s
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
Perfo
r
mance -
rem
o
v
e u
s
eless guava
t
ransformat
i
o
n
commit
|
commitdiff
|
tree
2019-07-17
lgou
b
et
F
i
x detection of ps
e
udo confli
c
ts
o
n
single-valued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
g
o
ubet
Reg
r
ession
o
n the group/match right-click
actions in SMW
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Properly describe what the co
n
f
l
i
ct res
o
l
v
ing
acti
o
ns
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Add StructureMergeViewer customi
z
ation options
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Sho
r
tc
u
t the UMLPostProcessor's
s
u
bset
im
p
lications
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Preve
n
t
NPE from
overriden R
e
s
ou
r
ce implementations
commit
|
commitdiff
|
tree
2019-07-16
lgou
b
et
Ignore
"or
i
g
i
nalTargetObjec
t
s"
f
rom th
e
EMF Compare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgou
b
et
Bump versions to
3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgoubet
Adapt t
e
sts to EG
i
t
change of behavi
o
r
commit
|
commitdiff
|
tree
2019-05-29
lgo
u
b
et
Enable users
t
o merge all
conflicts at
once through
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
l
g
o
u
bet
Mergi
n
g s
i
ngle-valued containment chan
g
es
c
a
n lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgo
u
b
et
Ty
p
os
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Prev
e
nt LC
S
compu
t
a
tion wh
e
n we
do
not need ordering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgo
u
bet
Preve
n
t duplicate insertion
points to be shown in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgoubet
Pr
e
vent CM
V
dispo
s
al
w
h
en user selects m
u
l
tiple e
l
ements
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgoubet
Only add
n
ew ada
p
t
ers
w
h
e
n ne
e
de
d
commit
|
commitdiff
|
tree
2019-04-14
lg
o
ubet
Iterate over t
h
e differ
e
n
ces
i
n
stead of the matches
commit
|
commitdiff
|
tree
2019-04-09
lgou
b
et
Preve
n
t OutOfM
e
moryErrors fro
m
the
U
I when switching CMV
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
Performance - Computing req
u
irement
s
ti
m
es
commit
|
commitdiff
|
tree
2019-04-08
lgoub
e
t
The
UML tests shou
l
dn't use a cach
e
d instance of EMFCompare
commit
|
commitdiff
|
tree
2019-04-03
lgoubet
Restore possi
b
ility to remove
merger
s
f
ro
m
t
h
e
r
egistry
commit
|
commitdiff
|
tree
2019-03-22
lgoubet
Make sure we ho
o
k the UI w
h
en use
r
s pro
v
i
d
e a
p
recomputed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgo
u
bet
Bump EMF Compare
t
o 3
.
3
.
7 in prep
a
r
a
tion
f
or
2
019-
0
6
commit
|
commitdiff
|
tree
2019-03-21
l
goube
t
Disposing of th
e
comparison shouldn'
t
be done
b
y t
h
e SMV
commit
|
commitdiff
|
tree
2019-03-04
l
g
ou
b
et
Avoid
ClassCa
s
tEx
c
eption when merging feature map chan
g
es
commit
|
commitdiff
|
tree
2019-02-26
lgoub
e
t
Bump
v
ersion
s
f
o
r 3
.
3
.
6 for 2019-03
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
patc
h
ModelGitMergeEditorInput for EG
i
t
5
.
3
.
0 compatibilit
y
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Suppres
s
guav
a
nested
concaten
a
t
i
o
n
s
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Remove
a
ccidental
u
se
of Gua
v
a
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
SWTException when switchin
g
c
omparisons
i
n a compare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
l
g
o
u
be
t
Allow clien
t
s to provide pre-
c
omp
u
t
e
d
comparis
o
ns to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
l
g
o
u
b
et
Ignore failing git
tests for now
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Bump versions to 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Use a
r
e
le
a
sed vers
i
on of Sirius
commit
|
commitdiff
|
tree
2018-11-30
lgoubet
[54173
0
] Rev
e
rts d59c924 due to an UI fr
e
ez
e
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bump feature versions
commit
|
commitdiff
|
tree
2018-06-22
lgo
u
b
e
t
bump vers
i
o
n
s
commit
|
commitdiff
|
tree
2018-06-22
lgou
b
et
EM
F
Compare is no longer compat
i
ble wi
t
h
e
git < 4
.
2
commit
|
commitdiff
|
tree
next