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
b
e
t
Remove outdated target pla
t
forms
commit
|
commitdiff
|
tree
2021-11-29
lgoubet
Bu
m
p versi
o
n to
3
.
3
.
17
commit
|
commitdiff
|
tree
2021-10-19
l
goubet
Al
l
o
w
c
o
nf
i
g
u
r
ation of the model
provider's cach
e
expi
r
atio
n
.
.
.
commit
|
commitdiff
|
tree
2021-10-18
lgoubet
Re
t
rieve
a
ll f
i
xes
fro
m
t
h
e E
G
it team in the MergeEditorInput
commit
|
commitdiff
|
tree
2021-10-18
lgoubet
EMF Compare needs
c
o
mpatibility with
b
o
th
E
G
it
5 and
6
commit
|
commitdiff
|
tree
2021-10-14
lgoubet
Cannot merge
a
d
ded/del
e
t
ed resources
commit
|
commitdiff
|
tree
2021-10-07
lgoubet
Bump version to 3
.
3
.
16
commit
|
commitdiff
|
tree
2021-10-07
lgoubet
switc
h
to latest
j
ar
s
igner
commit
|
commitdiff
|
tree
2021-10-07
lgoube
t
2
0
21-09 tp + 2021-1
2
m
i
lestone of EGit
t
o co
p
e with
.
.
.
commit
|
commitdiff
|
tree
2021-07-20
lgoubet
change visibilit
y
o
f
the
r
esolution conte
x
t
commit
|
commitdiff
|
tree
2021-07-19
lgoubet
Bump version to
3
.
3
.
15
commit
|
commitdiff
|
tree
2021-07-19
l
g
oubet
Enable diagram po
s
t proc
e
ssor for GMF 1
.
10 and above
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
Fix
r
elease script
commit
|
commitdiff
|
tree
2021-07-16
lgoub
e
t
f
i
x release pub
l
ication s
c
ript
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
Ad
d
s
c
ri
p
t
to publish release
s
for JIRO
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
Fix del
e
te-change conflict detection
(
at
file level)
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
Prevent
N
PE
f
r
o
m
the t
i
tle
build
e
r job
if
r
un during
.
.
.
commit
|
commitdiff
|
tree
2021-07-16
lgoube
t
Switch to 2
0
21-06 tp and l
a
test EG
i
t versio
n
commit
|
commitdiff
|
tree
2021-02-23
lgoubet
Use Unix li
n
e delimiters for shel
l
s
cripts
commit
|
commitdiff
|
tree
2021-02-23
lg
o
u
be
t
A
dd s
c
r
ipt to publ
i
sh milest
o
n
e
s for JI
R
O
commit
|
commitdiff
|
tree
2021-02-23
l
goubet
Add
nigh
t
l
y
publication scr
i
p
t for JIRO
commit
|
commitdiff
|
tree
2021-02-23
lgoubet
Open ra
n
ge
s
to accept
Guava 30
.
1
commit
|
commitdiff
|
tree
2021-02-08
lgoubet
Bump vers
i
on
t
o
3
.
3
.
1
4
commit
|
commitdiff
|
tree
2021-02-08
lg
o
ubet
Do
n
ot close
the r
e
p
o
sito
r
y when c
r
eating the
EMF merge
.
.
.
commit
|
commitdiff
|
tree
2021-01-05
lgoub
e
t
Potent
i
a
l NPE
commit
|
commitdiff
|
tree
2020-11-24
lgoube
t
Make sure folders are created when ex
t
racting inp
u
t
.
.
.
commit
|
commitdiff
|
tree
2020-11-20
lgou
b
et
Bu
m
p versions
t
o
3
.
3
.
13
commit
|
commitdiff
|
tree
2020-11-19
l
g
o
ub
e
t
Do
not close the r
e
posit
o
r
y
, ge
t
Rep
o
sitoryCache()
.
clear
.
.
.
commit
|
commitdiff
|
tree
2020-10-21
lgoubet
Allow
l
oa
d
ing of
m
odels us
i
ng ID attributes for comparison
commit
|
commitdiff
|
tree
2020-10-21
lgoubet
C
o
m
p
atibility recent mo
c
kito
commit
|
commitdiff
|
tree
2020-10-04
lgoubet
Only consi
d
er files we've
e
x
tracted
a
s potential test
.
.
.
commit
|
commitdiff
|
tree
2020-08-31
lgoubet
D
e
lete sub-p
r
o
j
ects first when cleaning up test workspace
commit
|
commitdiff
|
tree
2020-07-22
lgoubet
B
um
p
V
ersions to 3
.
3
.
12
commit
|
commitdiff
|
tree
2020-07-22
lgoube
t
F
i
x name o
f
201
9
-
1
2 t
a
rget plat
f
o
r
m
commit
|
commitdiff
|
tree
2020-06-26
lgoubet
F
i
x GitTestSupport
commit
|
commitdiff
|
tree
2020-05-26
lg
o
ubet
Bump versions
to
3
.
3
.
11
commit
|
commitdiff
|
tree
2020-04-21
l
g
ou
b
e
t
Git t
e
st f
r
amework fail
i
ng on windows
commit
|
commitdiff
|
tree
2020-01-14
lgoubet
B
ump
update s
i
tes t
o
3
.
3
.
10
commit
|
commitdiff
|
tree
2020-01-14
lgoube
t
B
um
p
EMF Co
m
p
are to 3
.
3
.
10 and add
2
019-12 ta
r
get
platform
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
Prevent NPE from the
clo
s
i
n
g of
a
C
omparison Di
a
log
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
C
o
mpatibility with
J
Git
5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lg
o
u
bet
Potential NPE when switching
files in the c
o
mpar
e
dialog
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
Sw
i
tch EMF Comp
a
re to Guava 27
commit
|
commitdiff
|
tree
2019-09-25
lgo
u
bet
Re
-
en
a
ble
signing
an
d
tycho-p2-
p
lug
i
n, swi
t
c
h webs
i
t
e
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Build test
i
ng - disable tycho-
p
2-pl
u
gin
commit
|
commitdiff
|
tree
2019-09-25
lgoube
t
Build testing -
disable
eclip
s
e jar
s
i
g
n
e
r
commit
|
commitdiff
|
tree
2019-09-24
lgoubet
EMF Compare docu
m
entation jar is unsigned
commit
|
commitdiff
|
tree
2019-09-19
lg
o
ube
t
Replace Guava wit
h
Ja
v
a 8
commit
|
commitdiff
|
tree
2019-09-19
lgoub
e
t
Pot
e
ntial
r
ace
c
ondit
i
on
w
hen loadin
g
EP
a
cka
g
es
fo
r
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Pot
e
n
t
ial NPE w
i
th some implem
e
ntat
i
ons
o
f the property
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
S
o
me implementations of Resource
.
Diagnostic may return
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
l
g
o
ubet
EMF Compare does n
o
t
support r
e
lative xs
i
:schemaL
o
c
ati
o
n
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
l
g
o
ubet
A
PI comp
a
ti
b
ility
commit
|
commitdiff
|
tree
2019-09-18
lgou
b
et
Remo
v
e
part of guav
a
uses
commit
|
commitdiff
|
tree
2019-09-18
lg
o
ubet
Bum
p
t
o 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lgo
u
bet
Open the com
p
are n
a
vig
a
table as inter
n
a
l API
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Registe
r
t
h
e
navigata
b
l
e
so that the
t
oolbar actions
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lgo
u
b
e
t
The navig
a
tabl
e
's cac
h
e
n
eed
s
to b
e
cleared when
w
e
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
l
goubet
The
Mat
c
hEn
g
ineFactory doesn't make use of
i
ts
s
etters
commit
|
commitdiff
|
tree
2019-09-16
l
goubet
Happ
y
checksty
l
e
commit
|
commitdiff
|
tree
2019-09-11
lgo
u
bet
Update setup file
commit
|
commitdiff
|
tree
2019-09-10
l
g
oubet
Target p
l
a
t
f
o
r
m
based
o
n 2019-06
commit
|
commitdiff
|
tree
2019-09-10
lgo
u
b
e
t
Behavior change in 2019-06 -
Except
i
ons are now in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgou
b
e
t
R
emove th
e
3
2 bi
t
platfor
m
s for our target c
o
nfigurations
commit
|
commitdiff
|
tree
2019-09-06
lgoub
e
t
I
n
d
ex is
s
ue
w
hen merging non-
u
nique attribute
s
' e
l
ements
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
D
iffs de
p
end
i
ng on pseudo-conflicts do n
o
t
reject th
e
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
l
g
oub
e
t
MO
V
E difference
s
al
s
o need
to
t
ake in
t
o accou
n
t
the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Ina
c
curat
e
conflict dete
c
t
i
on f
o
r mov
e
s in non-cont
a
inmen
t
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoube
t
M
o
ves with non-uniq
u
e values an
d
add
i
tion
/
deletions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Only MOVE dif
f
s need to be ignore
d
when computi
n
g
the L
C
S
commit
|
commitdiff
|
tree
2019-09-04
lgoub
e
t
Conf
l
ict
detection on ind
e
x c
h
anges must
t
ake F
e
atureFi
l
ter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
M
a
k
e su
r
e the UI won't tr
y
to compute the LCS
f
or
h
uge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
l
g
oube
t
T
he "accept/re
j
ect" all
non-
c
onflictin
g
acti
o
n sho
u
ld
n
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
Fix
dif
f
,
con
f
lict detection and merg
i
n
g of non-unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoubet
Potenti
a
l
out of bounds
e
xce
p
t
i
on
commit
|
commitdiff
|
tree
2019-08-27
lgo
u
b
e
t
C
ompa
t
i
b
il
i
ty with jgit
5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgou
b
e
t
Performance - use Di
f
fCrossReferencer whe
n
possible
commit
|
commitdiff
|
tree
2019-08-22
lgoub
e
t
regression - right-click ac
t
i
o
ns o
n
singl
e
diff sel
e
ction
s
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Open SMV
API to al
l
ow
i
mplement
e
rs to a
c
cess the raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lg
o
u
b
et
Prev
e
nts
e
xceptions
f
r
om being thrown from the viewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
Performance - use streams
instead of gua
v
a
iterations
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lg
o
ub
e
t
Performance - re
m
ove u
s
eless guava transformation
commit
|
commitdiff
|
tree
2019-07-17
lgoubet
Fix dete
c
t
i
o
n of pseudo c
o
nflicts o
n
single-val
u
ed
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
R
e
gre
s
sion
o
n
t
h
e g
r
oup/match r
i
ght-click acti
o
n
s in
SMW
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Prop
e
rly describe wh
a
t t
h
e
conflict resolving actions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Add Struc
t
ureMergeViewer cust
o
mization option
s
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Shortcu
t
th
e
UML
P
ostProcessor'
s
su
b
set
i
mpl
i
cation
s
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Prevent NPE fr
o
m
overriden Reso
u
rce i
m
plementations
commit
|
commitdiff
|
tree
2019-07-16
lgo
u
bet
Ig
n
o
r
e "origina
l
TargetObjects" f
r
om
t
he EMF Compare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
l
g
oubet
Bump vers
i
ons to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgoub
e
t
A
d
apt tests to EGit
change
of behavio
r
commit
|
commitdiff
|
tree
2019-05-29
lgoubet
Ena
b
l
e
u
s
e
r
s to merge all confli
c
t
s
at once throu
g
h
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
l
goubet
Merging sing
l
e-va
l
ued co
n
tainment changes can
lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Typos
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Prevent
LCS com
p
utation
w
hen we
do not need ordering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgoubet
Prevent dup
l
icate insertio
n
points to be
shown in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
l
g
oubet
Prev
e
nt CMV
d
ispo
s
al
whe
n
user s
e
lects
m
u
lti
p
le elem
e
nts
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgoubet
Only
add new adapters when needed
commit
|
commitdiff
|
tree
2019-04-14
lgoubet
Iterate over
t
he dif
f
erenc
e
s
i
ns
t
ea
d
of the
matches
commit
|
commitdiff
|
tree
2019-04-09
lgoubet
P
r
event OutO
f
Me
m
o
ryErro
r
s fr
o
m
the UI when switching CMV
commit
|
commitdiff
|
tree
next