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
Remove outdated target platforms
2021-11-29
lgoubet
Remove o
u
t
d
a
t
ed target p
l
atforms
commit
|
commitdiff
|
tree
2021-11-29
l
g
oubet
Bum
p
version to 3
.
3
.
17
commit
|
commitdiff
|
tree
2021-11-25
Eik
e
Steppe
r
[
577
0
00
]
Co
m
parison
.
getMatch(
e
) can r
e
turn null an
d
.
.
.
commit
|
commitdiff
|
tree
2021-10-19
lgoubet
Allow configuration of the mo
d
el
p
r
ovider's
cache expiration
.
.
.
commit
|
commitdiff
|
tree
2021-10-18
lgoubet
Retrieve all f
i
xes from
t
he EGit te
a
m in the MergeE
d
i
t
o
r
I
nput
commit
|
commitdiff
|
tree
2021-10-18
lgoube
t
EMF Compare needs co
m
pa
t
ibility
w
i
th b
o
t
h EGit 5 and 6
commit
|
commitdiff
|
tree
2021-10-14
lgoubet
Cannot merge
a
d
d
e
d/deleted
resourc
e
s
commit
|
commitdiff
|
tree
2021-10-07
lgo
u
bet
Bu
m
p v
e
rs
i
on to 3
.
3
.
16
commit
|
commitdiff
|
tree
2021-10-07
lgoube
t
switch to latest jarsig
n
er
commit
|
commitdiff
|
tree
2021-10-07
lgo
u
b
et
2021
-
09 tp + 2021-12 m
i
lestone
of E
G
it to cope with
.
.
.
commit
|
commitdiff
|
tree
2021-07-20
lg
o
ube
t
chan
g
e visibilit
y
of the resolu
t
i
o
n context
commit
|
commitdiff
|
tree
2021-07-19
lgoubet
Bump version to 3
.
3
.
15
commit
|
commitdiff
|
tree
2021-07-19
lgou
b
et
En
a
bl
e
diagram post
processor
f
or GMF 1
.
10 and
above
commit
|
commitdiff
|
tree
2021-07-16
lgoube
t
Fix release script
commit
|
commitdiff
|
tree
2021-07-16
l
g
oubet
fix release publi
c
a
tion script
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
Add script to publish relea
s
es for JIRO
commit
|
commitdiff
|
tree
2021-07-16
lgo
u
bet
Fix delete-c
h
ange con
f
l
ic
t
d
e
te
c
t
ion (at file lev
e
l
)
commit
|
commitdiff
|
tree
2021-07-16
lgoube
t
Preve
n
t NPE from
t
he title buil
d
er job if run during
.
.
.
commit
|
commitdiff
|
tree
2021-07-16
l
g
o
ube
t
Swi
t
ch t
o
2021-0
6
tp and latest E
G
it ver
s
ion
commit
|
commitdiff
|
tree
2021-02-23
lgoub
e
t
Use Unix line delimiters fo
r
shel
l
s
cripts
commit
|
commitdiff
|
tree
2021-02-23
lgoubet
Add script
to publish m
i
lestones for JIRO
commit
|
commitdiff
|
tree
2021-02-23
lgou
b
et
Add
nightly publication script
f
or J
I
RO
commit
|
commitdiff
|
tree
2021-02-23
l
g
oubet
Op
e
n ranges to accept Guava 30
.
1
commit
|
commitdiff
|
tree
2021-02-08
lgoubet
Bump ver
s
ion to
3
.
3
.
1
4
commit
|
commitdiff
|
tree
2021-02-08
lgoubet
Do not clo
s
e t
h
e reposito
r
y wh
e
n cr
e
atin
g
t
h
e EMF
m
erge
.
.
.
commit
|
commitdiff
|
tree
2021-01-05
lg
o
ub
e
t
P
o
tential NPE
commit
|
commitdiff
|
tree
2020-11-24
lgoubet
Make sure folders are created wh
e
n extracting input
.
.
.
commit
|
commitdiff
|
tree
2020-11-20
l
goubet
Bump versions t
o
3
.
3
.
1
3
commit
|
commitdiff
|
tree
2020-11-19
l
goubet
Do not
c
l
o
se the rep
o
sitory, getRepository
C
ache()
.
clear
.
.
.
commit
|
commitdiff
|
tree
2020-10-21
lgo
u
bet
A
l
low loa
d
ing of
models using ID attri
b
ut
e
s
for com
p
arison
commit
|
commitdiff
|
tree
2020-10-21
lg
o
ubet
Comp
a
tibility
recent mockito
commit
|
commitdiff
|
tree
2020-10-04
lgoube
t
O
nly consider f
i
les we've e
x
trac
t
ed as potent
i
al t
e
st
.
.
.
commit
|
commitdiff
|
tree
2020-08-31
lgoubet
Delete sub-p
r
ojects first when cleaning
u
p
t
est workspace
commit
|
commitdiff
|
tree
2020-07-22
lgou
b
et
Bump Versions to 3
.
3
.
12
commit
|
commitdiff
|
tree
2020-07-22
lgoubet
Fix na
m
e
o
f 2
0
19-12 target platform
commit
|
commitdiff
|
tree
2020-07-01
Gle
n
n Pl
o
uhin
e
c
[564680] Improved dia
g
ram d
i
spl
a
y
.
commit
|
commitdiff
|
tree
2020-06-26
lgoubet
Fi
x
GitTe
s
tSuppor
t
commit
|
commitdiff
|
tree
2020-05-26
lgoubet
Bu
m
p ver
s
ions to 3
.
3
.
11
commit
|
commitdiff
|
tree
2020-04-21
Glenn Plouhinec
[5
6
1825]
Merge a
S
i
rius Node doesn't m
e
rge "a
c
tual
M
apping
.
.
.
commit
|
commitdiff
|
tree
2020-04-21
lgoubet
Git test framework
f
ailing on windows
commit
|
commitdiff
|
tree
2020-01-14
lgoubet
Bump upd
a
te sites to 3
.
3
.
1
0
commit
|
commitdiff
|
tree
2020-01-14
lgou
b
et
Bu
m
p EMF Compare to 3
.
3
.
10 and add 2019-12 tar
g
et platform
commit
|
commitdiff
|
tree
2020-01-06
lgou
b
e
t
P
r
event NP
E
from the clo
s
i
ng of a Comparis
o
n D
i
al
o
g
commit
|
commitdiff
|
tree
2020-01-06
lg
o
ubet
Compa
t
ibi
l
ity
w
ith JGit 5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
Potential NPE whe
n
s
witching files in
t
he compare dialog
commit
|
commitdiff
|
tree
2019-11-05
lg
o
ub
e
t
Switch EMF Compa
r
e to
G
u
ava 27
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
R
e-
e
nable signin
g
and
t
y
cho-p2-plugin, switch
website
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lgou
b
et
Bui
l
d t
e
sting
-
d
isa
b
l
e tycho-
p
2-plugin
commit
|
commitdiff
|
tree
2019-09-25
lgoub
e
t
Bui
l
d
t
e
sting - dis
a
ble ecli
p
se jarsig
n
e
r
commit
|
commitdiff
|
tree
2019-09-24
lgoubet
EMF Compar
e
document
a
tio
n
jar is u
n
signed
commit
|
commitdiff
|
tree
2019-09-19
l
g
oubet
Re
p
la
c
e Guava with
Ja
v
a 8
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Potential race
c
o
ndition when loading E
P
ackages for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Pot
e
nti
a
l NPE
with some implementati
o
ns o
f
t
he
propert
y
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgo
u
bet
Some implementation
s
o
f
Reso
u
rce
.
D
i
agnostic
may return
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
EMF Compare does
n
ot support relative x
s
i
:
schemaLo
c
ation
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
API compatibility
commit
|
commitdiff
|
tree
2019-09-18
lgoub
e
t
Rem
o
ve pa
r
t of
guava uses
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
B
u
mp to 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Open the
compa
r
e navigatable a
s
inte
r
nal API
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Reg
i
ste
r
the navigatabl
e
s
o
t
hat the too
l
bar
actions
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lgoubet
Th
e
na
v
igatable's
c
ache needs to be cl
e
are
d
w
hen we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lgo
u
bet
The MatchEngi
n
eFactory doesn'
t
make use of its
setters
commit
|
commitdiff
|
tree
2019-09-16
lgo
u
bet
Happy
c
heckstyle
commit
|
commitdiff
|
tree
2019-09-11
lgou
b
et
Update se
t
up file
commit
|
commitdiff
|
tree
2019-09-10
lgoube
t
Target platform based on 2019-06
commit
|
commitdiff
|
tree
2019-09-10
lg
o
u
bet
Beha
v
ior
c
ha
n
ge
i
n 2
0
1
9
-06 - Exceptions a
r
e now in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgoube
t
Remove the 32 bit platforms for
our
t
arget
co
n
figurat
i
o
n
s
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Index iss
u
e
wh
e
n
m
erging non-unique attributes'
elements
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Diffs depe
n
ding o
n
p
seudo-conflic
t
s do
n
ot reject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
MOVE differences also need to take into account the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Inaccurate conflict detection for mov
e
s
in
n
on-containment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Mov
e
s with
n
o
n-unique v
a
lues a
n
d addition/deletions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgou
b
et
Only MO
V
E dif
f
s n
e
ed to be igno
r
e
d when c
o
mputing t
h
e LCS
commit
|
commitdiff
|
tree
2019-09-04
lg
o
ubet
Conflict d
e
t
e
c
t
io
n
o
n inde
x
change
s
must ta
k
e F
e
atureFilter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Make sure the UI won't try to compute the
L
CS for huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
Th
e
"accept/reject" all non-conflicting action
s
h
o
u
ldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
Fi
x
diff,
c
on
f
lict
de
t
ectio
n
an
d
merging of n
o
n-unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoub
e
t
P
o
tential out of bounds except
i
on
commit
|
commitdiff
|
tree
2019-08-27
lgoubet
Compatibility with jgit
5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoube
t
P
erforman
c
e
- use DiffCrossRe
f
erencer when
possib
l
e
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
regressi
o
n
-
right
-
click actions on single diff selections
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
O
pen SM
V
API to allow i
m
plementers to acces
s
th
e
raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
l
g
o
u
bet
Pr
e
vent
s
exceptions from being thr
o
w
n
from the viewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgou
b
et
P
erformance - use s
t
reams i
n
s
t
ead of guava it
e
rations
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
Perf
o
rmance - remove useless guava trans
f
orm
a
t
ion
commit
|
commitdiff
|
tree
2019-07-17
Christian W
.
Damus
[
5
22080] [UML]
Add-add conflicts in
s
tereotype
a
ppl
i
c
ation
.
.
.
commit
|
commitdiff
|
tree
2019-07-17
lgoube
t
F
i
x dete
c
tion o
f
p
seu
d
o
c
onflict
s
on single-valued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoube
t
R
egression o
n
t
h
e
group/match right
-
cl
i
ck
act
i
ons
i
n SMW
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Pr
o
p
erly d
e
s
cri
b
e what the confli
c
t resol
v
ing actions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
M
artin Fleck
[5
0
6928] Com
p
a
risonScopeE
d
itorI
n
put does not respect
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Stefan Dirix
Cancel Faste
r
in Pr
o
ximityEObj
e
ctMa
t
cher
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Add Str
u
ctureMergeViewer customizati
o
n o
p
tions
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
Shortcut the UMLPostPro
c
essor'
s
subset implicatio
n
s
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Axel Richard
Activation of all Git tests
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Preven
t
N
P
E fro
m
o
ver
r
iden Resource im
p
l
e
mentations
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Ignore "originalTa
r
getOb
j
ects" from th
e
EMF
C
ompare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgoubet
Bump ve
r
sions
t
o 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
W
i
lliam
P
ier
s
E
na
b
led "acce
p
t
cha
n
ge"
a
ction o
n
multiple di
f
f se
l
e
ction
commit
|
commitdiff
|
tree
2019-07-04
lgo
u
bet
Adapt tests
t
o EGit ch
a
nge of beh
a
v
i
or
commit
|
commitdiff
|
tree
2019-05-29
lgoubet
Enabl
e
user
s
to mer
g
e
a
ll conf
l
icts at onc
e
through
.
.
.
commit
|
commitdiff
|
tree
next