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.13
2020-11-20
lgoube
t
Bump versions to 3
.
3
.
13
commit
|
commitdiff
|
tree
2020-11-19
lgoubet
Do not close the r
e
pository,
g
e
t
Reposit
o
r
yCach
e
(
)
.
c
l
ear
.
.
.
commit
|
commitdiff
|
tree
2020-10-21
lgoub
e
t
Allow load
i
ng
of models using
ID
attribu
t
es for comparison
commit
|
commitdiff
|
tree
2020-10-21
lgoubet
Compatib
i
lity
r
ecent
mockito
commit
|
commitdiff
|
tree
2020-10-04
lgoub
e
t
O
n
ly cons
i
der files we've extracted
a
s poten
t
ial test
.
.
.
commit
|
commitdiff
|
tree
2020-08-31
lgoub
e
t
Delete sub-projects first when cleaning up
t
e
st worksp
a
ce
commit
|
commitdiff
|
tree
2020-07-22
lgoubet
Bump Ve
r
s
ion
s
to
3
.
3
.
12
commit
|
commitdiff
|
tree
2020-07-22
lgoubet
Fix name of
2
0
19-
1
2
t
arget platform
commit
|
commitdiff
|
tree
2020-07-01
Gl
e
n
n
Plouhinec
[5646
8
0] Improved diag
r
am displ
a
y
.
commit
|
commitdiff
|
tree
2020-06-26
lgoubet
Fix GitT
e
st
S
upport
commit
|
commitdiff
|
tree
2020-05-26
lgoubet
Bump versions to
3
.
3
.
11
commit
|
commitdiff
|
tree
2020-04-21
G
l
enn P
l
ou
h
i
nec
[56182
5
]
M
erge a Sirius Node doe
s
n
't merge "actualMapping
.
.
.
commit
|
commitdiff
|
tree
2020-04-21
lgoub
e
t
Git test frame
w
o
rk
failing on windows
commit
|
commitdiff
|
tree
2020-01-14
lg
o
u
b
et
Bump update si
t
es to
3
.
3
.
10
commit
|
commitdiff
|
tree
2020-01-14
lgoubet
Bump EMF Compare to
3
.
3
.
10 a
n
d add
2
0
1
9-12
target platform
commit
|
commitdiff
|
tree
2020-01-06
lgou
b
et
Prevent NPE from
t
he closing of
a
Comparison Dial
o
g
commit
|
commitdiff
|
tree
2020-01-06
l
g
o
ubet
Co
m
p
atibility w
i
th
JGit 5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lgo
u
b
et
Potential NPE
w
hen swit
c
hing files in the compare d
i
a
log
commit
|
commitdiff
|
tree
2019-11-05
l
g
o
ubet
Switch EMF Comp
a
r
e
to Guava 27
commit
|
commitdiff
|
tree
2019-09-25
lgou
b
e
t
Re-enable
s
igning and tyc
h
o-p2-plugin,
s
witch website
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
l
go
u
b
et
Build testin
g
- disable tyc
h
o-p
2
-
plugi
n
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
B
uild testing
-
disable ec
l
ipse jarsigner
commit
|
commitdiff
|
tree
2019-09-24
lgoubet
EMF
Compare documenta
t
ion
j
ar is uns
i
g
ne
d
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
R
e
place Guava with Java 8
commit
|
commitdiff
|
tree
2019-09-19
l
goube
t
Pot
e
ntial race
c
ondition when loading EPackages for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Potential NPE with some i
m
plementations of the prop
e
rty
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
S
ome
implement
a
tions of Resource
.
Diagnostic may return
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lg
o
ub
e
t
EMF
Compar
e
does not support relative xsi:schemaL
o
cation
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgo
u
b
et
A
PI compatib
i
l
ity
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Remov
e
p
a
rt
of guava
uses
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Bu
m
p
to 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lg
o
u
b
et
Open the compare navi
g
a
table as i
n
ternal API
commit
|
commitdiff
|
tree
2019-09-18
l
g
o
ubet
Regis
t
e
r the
n
avigatable so that the toolb
a
r
actions
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lgou
b
et
The navigatab
l
e'
s
cache needs to be clear
e
d when
w
e
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
l
goubet
The Mat
c
hEngineFactory doesn't m
a
ke use
o
f its se
t
ters
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
H
a
ppy checksty
l
e
commit
|
commitdiff
|
tree
2019-09-11
lgoube
t
Updat
e
set
u
p file
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Target
p
latform based on 2019-06
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Behavi
o
r chan
g
e in 2019-06 - Exception
s
are now in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgoubet
R
emove the
3
2
bit p
l
atf
o
rm
s
for our target c
o
nfi
g
uration
s
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Index issue when mergi
n
g non-unique attribu
t
es' elements
commit
|
commitdiff
|
tree
2019-09-06
lgou
b
et
Diffs
d
epending on
p
seud
o
-confl
i
cts
do
n
ot reject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
MOVE differe
n
ces
also need
t
o take
i
nt
o
account the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lg
o
ube
t
Inac
c
u
r
a
te con
f
lict dete
c
ti
o
n
f
or move
s
i
n
non-cont
a
in
m
e
nt
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoub
e
t
Moves with n
o
n-unique values and addition/de
l
etions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoub
e
t
Only MOVE di
f
f
s
need
to be ignored when co
m
put
i
n
g
the LCS
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Conflict detec
t
ion on index chang
e
s must take Featur
e
F
ilter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoube
t
Make s
u
re the UI won't try
to compute the LCS for
h
uge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgo
u
bet
The "acc
e
p
t/reject" all non-confli
c
ting ac
t
i
on shou
l
dn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoub
e
t
Fix diff, conflic
t
d
et
e
ctio
n
and m
e
rging of non-unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoubet
Potenti
a
l out of
b
ounds exception
commit
|
commitdiff
|
tree
2019-08-27
l
g
o
ubet
Co
m
p
atibility w
i
th jgit 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgo
u
bet
P
e
rfo
r
mance - use DiffCrossR
e
f
e
rencer when po
s
sible
commit
|
commitdiff
|
tree
2019-08-22
lgo
u
bet
r
e
gression - right-click
a
cti
o
ns on sing
l
e
d
iff se
l
ections
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lg
o
ubet
Open
SMV API
to
a
llow implement
e
rs to
acc
e
ss the raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Preve
n
ts
ex
c
eptions from be
i
ng thrown from the viewe
r
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lg
o
ubet
Pe
r
formance
-
u
s
e st
r
eams instead of g
u
ava iterations
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoub
e
t
Perform
a
nce - remove use
l
ess guava
t
ran
s
for
m
a
tion
commit
|
commitdiff
|
tree
2019-07-17
Christian W
.
Da
m
us
[5
2
2080]
[
U
ML] Add-add
conflicts in stereoty
p
e applicati
o
n
.
.
.
commit
|
commitdiff
|
tree
2019-07-17
lgoubet
Fi
x
detection of
pse
u
do confli
c
t
s
on si
n
gle-valued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
g
oubet
Regressi
o
n o
n
the gr
o
up/match right-cli
c
k
a
ctions in SMW
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Properly de
s
crib
e
what the
conflict
resolving
a
c
tions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Mar
t
in
Fleck
[
506928] Co
m
p
arisonScopeEditorInput
d
oes no
t
respect
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Stefa
n
Dirix
Cance
l
Faster in Pro
x
imityEO
b
ject
M
a
t
cher
commit
|
commitdiff
|
tree
2019-07-16
lgoube
t
Add St
r
uctureMergeViewer c
u
stomiza
t
ion op
t
ions
commit
|
commitdiff
|
tree
2019-07-16
l
g
oubet
Shortcut th
e
UM
L
Post
P
ro
c
essor's sub
s
et
i
mplicati
o
ns
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Axel Richard
Activation of
al
l
G
it te
s
t
s
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
Pr
e
vent NPE
f
rom o
v
e
rr
i
de
n
R
e
source i
m
p
l
ementations
commit
|
commitdiff
|
tree
2019-07-16
l
goubet
Ignore "
o
ri
g
in
a
l
TargetObjects" from the EMF Compa
r
e
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgoubet
Bump versi
o
ns to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
W
illiam Piers
E
nabled "accept change" action on multiple diff
sele
c
t
ion
commit
|
commitdiff
|
tree
2019-07-04
lgoubet
Adapt t
e
sts to EGit
c
hange o
f
behavior
commit
|
commitdiff
|
tree
2019-05-29
lgoube
t
Enable
u
s
e
rs to merge all c
o
nflicts at
once throug
h
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
l
g
oubet
Mer
g
ing single-
v
alued c
o
n
t
ainment chang
e
s can lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgou
b
et
Typos
commit
|
commitdiff
|
tree
2019-05-23
l
goube
t
Prevent LCS com
p
utation
w
h
e
n we do not
n
eed ordering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
l
go
u
bet
Prevent duplicate insertion points to be shown in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgoubet
Prevent CMV
d
isposal
when user selects multip
l
e elements
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgou
b
e
t
Only
add
new adapters when needed
commit
|
commitdiff
|
tree
2019-04-14
lgoubet
Iterate o
v
er the dif
f
ere
n
ces instead of the matches
commit
|
commitdiff
|
tree
2019-04-09
lgoubet
P
r
e
vent OutOfMemoryErrors fro
m
the UI when
s
wit
c
hing CMV
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
Perfor
m
ance - Computing require
m
e
n
ts
t
imes
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
The UML
te
s
ts shoul
d
n't u
s
e a cache
d
in
s
tance of EMFCompare
commit
|
commitdiff
|
tree
2019-04-03
lgoubet
Restore poss
i
bility to r
e
move mergers
f
rom the
r
egistry
commit
|
commitdiff
|
tree
2019-04-01
W
i
lliam Piers
Fixed ArrayOutOfBoun
d
s
i
n
c
a
se of
e
mpty lists
commit
|
commitdiff
|
tree
2019-03-22
lg
o
ubet
M
ak
e
su
r
e we
hook the UI wh
e
n users pr
o
vi
d
e
a precomputed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
B
u
mp
E
MF Compar
e
to 3
.
3
.
7 in preparatio
n
for 20
1
9
-
06
commit
|
commitdiff
|
tree
2019-03-21
l
g
oubet
Dispo
s
ing of
t
he comparison
s
hou
l
dn'
t
be done by the SMV
commit
|
commitdiff
|
tree
2019-03-04
lgoube
t
Avoid ClassCastException
when mer
g
ing feature map
chan
g
es
commit
|
commitdiff
|
tree
2019-02-26
l
goubet
B
u
mp versio
n
s for
3
.
3
.
6
for 2019-03
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
patch
ModelGitMergeEdit
o
rInput for
E
Git 5
.
3
.
0 compatibi
l
i
t
y
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Sup
p
ress guava n
e
sted concatenations
commit
|
commitdiff
|
tree
2019-02-11
lgoub
e
t
Re
m
ove
accidental use of
Gu
a
va
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
SWTException whe
n
swi
t
ching comparisons
i
n
a
compare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lg
o
u
b
et
Allow clients to p
r
o
vide pre-compute
d
comparisons to
.
.
.
commit
|
commitdiff
|
tree
2018-12-11
Philip Langer
[527567] Pr
o
vide
s
u
p
p
or
t
for a general pro
p
e
r
ty merge
.
.
.
commit
|
commitdiff
|
tree
2018-12-11
Philip
L
a
nger
[514079] Improve
m
irro
r
in
g
support
commit
|
commitdiff
|
tree
2018-12-04
l
goubet
Ignore fail
i
ng git tests
for no
w
commit
|
commitdiff
|
tree
2018-12-03
lgoub
e
t
Bump ver
s
i
o
n
s
to 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgo
u
bet
Use
a
released ver
s
ion of
Sirius
commit
|
commitdiff
|
tree
next