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
lgo
u
bet
Remove ou
t
da
t
ed target platforms
commit
|
commitdiff
|
tree
2021-11-29
lgou
b
e
t
Bum
p
versio
n
to
3
.
3
.
17
commit
|
commitdiff
|
tree
2021-10-19
lgoubet
Allow co
n
f
iguration of the model provider's cache
expiration
.
.
.
commit
|
commitdiff
|
tree
2021-10-18
lgoub
e
t
Ret
r
ieve
all fixes
fr
o
m the EGit
team in the Merge
E
di
t
o
rInput
commit
|
commitdiff
|
tree
2021-10-18
lgoube
t
EM
F
Compare needs compat
i
bility wi
t
h bo
t
h EGi
t
5 an
d
6
commit
|
commitdiff
|
tree
2021-10-14
lgoubet
Cann
o
t merge
add
e
d/dele
t
ed
resourc
e
s
commit
|
commitdiff
|
tree
2021-10-07
lg
o
ube
t
Bum
p
v
e
r
sion to 3
.
3
.
16
commit
|
commitdiff
|
tree
2021-10-07
lgoubet
switch to lat
e
st
j
arsigner
commit
|
commitdiff
|
tree
2021-10-07
lgoubet
2
021
-
09 t
p
+ 2021-12
miles
t
one of EGit to cope with
.
.
.
commit
|
commitdiff
|
tree
2021-07-20
lgo
u
bet
change visibility of
t
he
r
es
o
luti
o
n c
o
ntext
commit
|
commitdiff
|
tree
2021-07-19
lg
o
ubet
Bump version to 3
.
3
.
15
commit
|
commitdiff
|
tree
2021-07-19
lgoubet
Enable d
i
agram pos
t
processor fo
r
GMF 1
.
10
and above
commit
|
commitdiff
|
tree
2021-07-16
l
g
o
ubet
Fix
r
elea
s
e
s
c
r
ip
t
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
f
i
x release
publ
i
cation s
c
ript
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
A
d
d scri
p
t to
publish releases for JIRO
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
Fix delete-cha
n
ge co
n
fli
c
t detection (
a
t file
lev
e
l)
commit
|
commitdiff
|
tree
2021-07-16
l
goubet
Preven
t
NPE from the
t
itle
b
ui
l
der j
o
b if ru
n
du
r
in
g
.
.
.
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
S
wi
t
ch
to
2021-0
6
tp and latest EG
i
t version
commit
|
commitdiff
|
tree
2021-02-23
lgoubet
Us
e
Unix line delim
i
te
r
s
for shell scrip
t
s
commit
|
commitdiff
|
tree
2021-02-23
lgou
b
et
A
d
d script to publis
h
m
i
lestones
f
or JIRO
commit
|
commitdiff
|
tree
2021-02-23
lgo
u
b
e
t
Add
n
ightly
pub
l
ication script for JIRO
commit
|
commitdiff
|
tree
2021-02-23
l
goub
e
t
Open ranges
t
o accept
G
uava 30
.
1
commit
|
commitdiff
|
tree
2021-02-08
lgoubet
Bump
version to 3
.
3
.
14
commit
|
commitdiff
|
tree
2021-02-08
lgoube
t
Do not c
l
ose t
h
e r
e
pos
i
tor
y
when creating
t
he EM
F
merg
e
.
.
.
commit
|
commitdiff
|
tree
2021-01-05
l
g
oubet
Potential
NPE
commit
|
commitdiff
|
tree
2020-11-24
lgoubet
Make s
u
re fold
e
rs are created when extracting input
.
.
.
commit
|
commitdiff
|
tree
2020-11-20
lgoube
t
Bump v
e
r
sions to 3
.
3
.
13
commit
|
commitdiff
|
tree
2020-11-19
lgou
b
et
D
o
not close the reposito
r
y, getRepo
s
it
o
ryCache()
.
clear
.
.
.
commit
|
commitdiff
|
tree
2020-10-21
lgo
u
b
et
Allow loading of models using ID attributes for c
o
m
p
arison
commit
|
commitdiff
|
tree
2020-10-21
lg
o
ubet
Compatibility recen
t
mockito
commit
|
commitdiff
|
tree
2020-10-04
lgoubet
Only consider
files we've extracted as potential te
s
t
.
.
.
commit
|
commitdiff
|
tree
2020-08-31
lgoubet
Delete
su
b
-projects first when cleaning u
p
t
est wo
r
kspace
commit
|
commitdiff
|
tree
2020-07-22
lgoube
t
Bump Versions
t
o 3
.
3
.
12
commit
|
commitdiff
|
tree
2020-07-22
lgoubet
Fix name
o
f 2019
-
12 targe
t
p
latform
commit
|
commitdiff
|
tree
2020-06-26
l
goubet
F
i
x
GitTestSupport
commit
|
commitdiff
|
tree
2020-05-26
lgoubet
Bump
v
ersions to
3
.
3
.
1
1
commit
|
commitdiff
|
tree
2020-04-21
lgoubet
Git test f
r
amework failing
on wi
n
do
w
s
commit
|
commitdiff
|
tree
2020-01-14
l
g
oubet
B
ump up
d
ate site
s
to 3
.
3
.
10
commit
|
commitdiff
|
tree
2020-01-14
lgou
b
et
Bump EMF Compare to 3
.
3
.
10 and add 2019-12 target platfo
r
m
commit
|
commitdiff
|
tree
2020-01-06
lg
o
u
b
et
P
r
e
v
en
t
NPE from the closing of
a
Comparison Dialog
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
Compatibility w
i
th JGit 5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
l
g
oubet
Potential
N
PE when switching files in the compa
r
e dialog
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
Switch EMF Compare to Guava 2
7
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
R
e-enable signing and
tycho-p2-plugin, s
w
i
t
ch
website
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Build testing - dis
a
bl
e
tycho-
p
2-
p
lug
i
n
commit
|
commitdiff
|
tree
2019-09-25
l
goub
e
t
Build testing - disable eclipse
j
arsig
n
e
r
commit
|
commitdiff
|
tree
2019-09-24
lgoubet
EMF Compare documentati
o
n
j
ar is unsig
n
e
d
commit
|
commitdiff
|
tree
2019-09-19
lgo
u
b
e
t
Replace Guava
w
i
th Java
8
commit
|
commitdiff
|
tree
2019-09-19
lgou
b
e
t
Potential rac
e
condition
w
h
e
n
load
i
ng EPac
k
ages for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoub
e
t
Potential NPE with some implementat
i
o
ns of the pro
p
erty
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
S
o
m
e
i
mplementati
o
ns of Resource
.
D
iagn
o
stic may re
t
urn
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
l
goubet
E
MF Compare does
n
o
t support relati
v
e x
s
i:schemaLocation
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
API compatibil
i
ty
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
R
emo
v
e
p
art
of guava uses
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Bump
t
o
3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lgoube
t
Open the compare na
v
igatable as int
e
rnal API
commit
|
commitdiff
|
tree
2019-09-18
lgoub
e
t
Regis
t
er th
e
navi
g
atable so that the
toolbar actions
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
l
g
o
u
b
et
The navi
g
ata
b
le's cache needs to be clea
r
ed wh
e
n
we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lgoub
e
t
The MatchEngin
e
Factory d
o
esn'
t
make use
of its se
t
ters
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
Happy checksty
l
e
commit
|
commitdiff
|
tree
2019-09-11
l
g
oubet
U
pdat
e
setup file
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Target pl
a
tform
based on 2019
-
06
commit
|
commitdiff
|
tree
2019-09-10
lgoube
t
Behavior change in
2
0
19-06 - Exce
p
tion
s
are now
i
n
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgoubet
Re
m
ove the 32
b
it
p
l
atforms for our target configurations
commit
|
commitdiff
|
tree
2019-09-06
lgoube
t
Inde
x
issue
whe
n
merging non-unique attributes' elements
commit
|
commitdiff
|
tree
2019-09-06
lg
o
ube
t
Diffs dep
e
n
ding on pseu
d
o-conflicts do not reject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
MOVE differences also need t
o
take into account the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lg
o
ubet
Inaccura
t
e conflict detectio
n
for
moves in non-containment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoube
t
Moves with no
n
-unique values
and a
d
di
t
ion/deleti
o
ns
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
O
nly MO
V
E diffs
need to be ignored when comput
i
ng the
L
CS
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Conf
l
ict detection on index c
h
anges m
u
st take FeatureFilter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Make sure
the UI
w
on't try to compute
the LCS for huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
The "accept/reject" all non-confli
c
t
ing action shouldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
Fix diff,
c
onfli
c
t d
e
tecti
o
n and merging o
f
non-unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoubet
Po
t
ential out of
b
ounds except
i
on
commit
|
commitdiff
|
tree
2019-08-27
lgoubet
C
o
mpatibility with jg
i
t
5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
Performa
n
ce - use DiffCrossReferencer when possib
l
e
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
reg
r
ession
-
right
-
click actions on single diff
selections
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
l
goubet
O
p
e
n
SMV A
P
I to allow implementers to
acce
s
s the
raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Prevents
e
x
c
eptions f
r
om being thrown from the
v
i
e
wer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
Perfo
r
man
c
e - use streams instead of g
u
a
v
a iterat
i
ons
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgou
b
et
P
e
rformance - r
e
mov
e
use
l
ess gu
a
va transformat
i
o
n
commit
|
commitdiff
|
tree
2019-07-17
lg
o
u
b
et
Fix detection of pseudo con
f
licts on single-va
l
ued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
g
oubet
Regressio
n
on
the group/match righ
t
-
cl
i
ck actions
i
n SMW
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Properly describe what
the
conflic
t
r
e
solving
act
i
ons
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Add Struct
u
reMergeViewer customiza
t
i
on options
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Shortc
u
t the UMLPo
s
tProces
s
or's subset i
m
plicatio
n
s
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
Prevent NPE fro
m
o
v
erri
d
e
n
Resource implemen
t
ations
commit
|
commitdiff
|
tree
2019-07-16
l
goubet
Ignore
"
originalTargetObjects
"
from
t
he EM
F
Compare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
l
g
oubet
Bump v
e
rsions t
o
3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lg
o
ubet
Adap
t
te
s
ts to
EGi
t
c
h
an
g
e of be
h
a
v
ior
commit
|
commitdiff
|
tree
2019-05-29
lgo
u
bet
Enable
u
sers t
o
m
e
rge all co
n
flicts a
t
once
t
h
r
oug
h
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgou
b
et
Merg
i
ng single-valued c
o
nt
a
inment changes
c
an l
e
a
d
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
T
y
pos
commit
|
commitdiff
|
tree
2019-05-23
l
g
oub
e
t
Prevent LCS computatio
n
when
w
e
d
o not need or
d
ering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgoubet
P
revent duplicate insertion
p
o
ints to be shown in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lg
o
ubet
P
r
ev
e
nt CMV disposal
w
hen user s
e
le
c
ts multiple eleme
n
ts
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgo
u
bet
O
n
ly
a
d
d new ada
p
ters
w
h
en needed
commit
|
commitdiff
|
tree
2019-04-14
l
goub
e
t
Iterate ov
e
r the differences
instead of the matches
commit
|
commitdiff
|
tree
2019-04-09
lgoub
e
t
P
revent OutOfMemory
E
rro
r
s from the UI when switching CMV
commit
|
commitdiff
|
tree
next