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 outdated
tar
g
et platf
o
rms
commit
|
commitdiff
|
tree
2021-11-29
l
goubet
Bump version
t
o 3
.
3
.
1
7
commit
|
commitdiff
|
tree
2021-10-19
l
g
oubet
Allow con
f
iguration
o
f
t
he m
o
del prov
i
der'
s
cache ex
p
iration
.
.
.
commit
|
commitdiff
|
tree
2021-10-18
lgoubet
Retrieve
all fixes
from the EGit team in the MergeEditorInp
u
t
commit
|
commitdiff
|
tree
2021-10-18
lgoubet
EMF Compare ne
e
d
s compatibility with both E
G
it
5
and 6
commit
|
commitdiff
|
tree
2021-10-14
lgoubet
Cannot m
e
rge add
e
d/delet
e
d resources
commit
|
commitdiff
|
tree
2021-10-07
l
goubet
B
u
mp versi
o
n to 3
.
3
.
16
commit
|
commitdiff
|
tree
2021-10-07
lgoubet
switch to latest jarsigner
commit
|
commitdiff
|
tree
2021-10-07
l
g
oubet
20
2
1-09 tp + 2
0
21-12 milestone of EGit to cope with
.
.
.
commit
|
commitdiff
|
tree
2021-07-20
lgoubet
change visibil
i
ty of the reso
l
ution
c
ontext
commit
|
commitdiff
|
tree
2021-07-19
lgoubet
Bum
p
version to
3
.
3
.
1
5
commit
|
commitdiff
|
tree
2021-07-19
lgo
u
b
et
E
n
a
b
le diagr
a
m
p
ost
pr
o
cessor
for
GMF
1
.
10 a
n
d
a
b
o
v
e
commit
|
commitdiff
|
tree
2021-07-16
lg
o
u
b
et
Fix
re
l
ea
s
e script
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
fix rele
a
s
e
p
u
b
licati
o
n sc
r
ipt
commit
|
commitdiff
|
tree
2021-07-16
lgou
b
et
Add
scri
p
t
t
o
publish releases for JIRO
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
Fix delete
-
change
c
onflict detect
i
on
(at file level)
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
Prevent NPE f
r
om the titl
e
b
uilder
job i
f
run dur
i
n
g
.
.
.
commit
|
commitdiff
|
tree
2021-07-16
lgo
u
b
et
Switch
t
o 2021-06 t
p
and latest
E
Git versio
n
commit
|
commitdiff
|
tree
2021-02-23
lgoubet
Use Unix line d
e
l
i
miters
for shell
sc
r
ipts
commit
|
commitdiff
|
tree
2021-02-23
lgoubet
Ad
d
script to publish mil
e
stones for
JIRO
commit
|
commitdiff
|
tree
2021-02-23
l
g
o
u
b
et
Add nightly publication script for JIRO
commit
|
commitdiff
|
tree
2021-02-23
lgoubet
Open r
a
n
g
es to a
c
ce
p
t Guav
a
30
.
1
commit
|
commitdiff
|
tree
2021-02-08
lg
o
ubet
Bump ver
s
ion to 3
.
3
.
14
commit
|
commitdiff
|
tree
2021-02-08
l
goube
t
Do not clo
s
e
the repository
when c
r
eat
i
ng th
e
EMF mer
g
e
.
.
.
commit
|
commitdiff
|
tree
2021-01-05
lg
o
ubet
Potential NPE
commit
|
commitdiff
|
tree
2020-11-24
lgoub
e
t
Make sure
f
o
l
ders are created
w
h
e
n extracting input
.
.
.
commit
|
commitdiff
|
tree
2020-11-20
l
g
oub
e
t
Bu
m
p versio
n
s to 3
.
3
.
13
commit
|
commitdiff
|
tree
2020-11-19
lgoubet
Do
no
t
close
t
he repository, ge
t
Re
p
os
i
toryCache()
.
clear
.
.
.
commit
|
commitdiff
|
tree
2020-10-21
lg
o
ubet
Al
l
o
w loadin
g
o
f
model
s
u
s
ing ID attributes for co
m
pa
r
ison
commit
|
commitdiff
|
tree
2020-10-21
lgoubet
Compa
t
i
b
ility re
c
e
n
t m
o
c
kito
commit
|
commitdiff
|
tree
2020-10-04
lgou
b
et
Only con
s
ider files we've extracted as potential
test
.
.
.
commit
|
commitdiff
|
tree
2020-08-31
lgoubet
Dele
t
e
sub-p
r
o
jects first
when cle
a
n
i
n
g
up te
s
t workspace
commit
|
commitdiff
|
tree
2020-07-22
l
g
ou
b
et
Bump Ve
r
sions to 3
.
3
.
12
commit
|
commitdiff
|
tree
2020-07-22
l
g
oubet
Fix name of 2019-12
tar
g
e
t platform
commit
|
commitdiff
|
tree
2020-06-26
lgoubet
Fix
G
itTes
t
Support
commit
|
commitdiff
|
tree
2020-05-26
lgoubet
Bump
v
e
rsion
s
to 3
.
3
.
11
commit
|
commitdiff
|
tree
2020-04-21
lgoubet
Git test
f
r
a
mewo
r
k failing on
w
indows
commit
|
commitdiff
|
tree
2020-01-14
lgoubet
Bump update sites
t
o 3
.
3
.
10
commit
|
commitdiff
|
tree
2020-01-14
lgo
u
bet
Bump EMF
Compare to 3
.
3
.
1
0
and ad
d
20
1
9-12 target platform
commit
|
commitdiff
|
tree
2020-01-06
lgou
b
et
Prevent NP
E
from the clo
s
ing of a Com
p
aris
o
n
D
i
alog
commit
|
commitdiff
|
tree
2020-01-06
l
goubet
Compat
i
bility w
i
th JGit 5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lgoub
e
t
Potential NPE when
switching
f
iles in
t
he co
m
pa
r
e d
i
a
l
o
g
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
Switch EM
F
Comp
a
re to Guava 27
commit
|
commitdiff
|
tree
2019-09-25
lg
o
u
b
et
Re-enable signing and ty
c
ho-p2-plugin, s
w
itch webs
i
te
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
l
g
oubet
Build testing - dis
a
ble tycho-p2-plugin
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Build testing - disable
eclipse
jar
s
ign
e
r
commit
|
commitdiff
|
tree
2019-09-24
l
g
oubet
EMF Co
m
par
e
documentation
jar is
u
nsigned
commit
|
commitdiff
|
tree
2019-09-19
l
g
ou
b
et
Replace Guava wi
t
h Java
8
commit
|
commitdiff
|
tree
2019-09-19
l
g
oubet
P
o
tential race condition
w
hen load
i
n
g E
P
a
c
kage
s
for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Pot
e
ntial
N
PE with som
e
imp
l
e
men
t
ations of the prop
e
rty
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
l
g
oubet
Some implementations
o
f Reso
u
r
c
e
.
Diagno
s
tic may
return
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
EMF Compare does not support relative xsi:schemaL
o
cati
o
n
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
API compatibility
commit
|
commitdiff
|
tree
2019-09-18
lgou
b
et
Remove p
a
r
t
of g
u
ava uses
commit
|
commitdiff
|
tree
2019-09-18
lg
o
ubet
B
u
mp to 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
O
p
en the compar
e
n
av
i
gatable a
s
inter
n
a
l API
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
R
e
gister the navig
a
table s
o
t
hat the toolbar actio
n
s
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lgou
b
e
t
The navi
g
atable's cache
n
ee
d
s to
b
e cleared when w
e
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lg
o
ube
t
The M
a
tchEngineFacto
r
y doesn't ma
k
e use of its set
t
ers
commit
|
commitdiff
|
tree
2019-09-16
lgoube
t
Happy
c
hec
k
style
commit
|
commitdiff
|
tree
2019-09-11
lgo
u
b
e
t
Update setup
file
commit
|
commitdiff
|
tree
2019-09-10
lg
o
ubet
T
a
rg
e
t platform bas
e
d on 2019-06
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Beha
v
ior change
i
n 2019-06 - Exceptions are
n
ow in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgoubet
Re
m
ove t
h
e
32 bit plat
f
orms for our
target config
u
rations
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
I
ndex issu
e
wh
e
n
merging non-u
n
iqu
e
attributes'
element
s
commit
|
commitdiff
|
tree
2019-09-06
l
g
oubet
Diffs depending
o
n pseudo-conflicts
d
o n
o
t
reject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
l
goubet
MOVE differences also need to take into a
c
count the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoub
e
t
Inaccurate conflict detection
f
or mo
v
e
s
i
n
non-containment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Moves with non-unique values
a
nd
addition/dele
t
ions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
O
nly MOVE di
f
fs need to
be ignor
e
d
w
hen computing the LCS
commit
|
commitdiff
|
tree
2019-09-04
l
gou
b
et
C
onfl
i
ct detect
i
on o
n
i
nde
x
changes must take
Fea
t
ureFilter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Make s
u
re the UI
w
o
n'
t
try t
o
compute the LCS for huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
l
g
oubet
The
"
accept/rej
e
ct" all non-conflictin
g
a
c
tion shouldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgo
u
bet
Fix d
i
ff, conflict detection a
n
d merging of non-uniqu
e
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoubet
Potential out
o
f
bounds exception
commit
|
commitdiff
|
tree
2019-08-27
lgoubet
Compatibility wi
t
h
jgit 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
l
g
o
u
b
et
Perfor
m
ance - use Di
f
fCross
R
eferencer when
p
o
ssible
commit
|
commitdiff
|
tree
2019-08-22
lgou
b
et
regress
i
on - right-cl
i
c
k actions on single
diff sel
e
ctions
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
l
goubet
Op
e
n S
M
V API to allow im
p
le
m
enters to access the raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
l
g
oubet
Prevents excep
t
ions
from bei
n
g thrown
f
rom
the
v
iewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
Performance -
use
s
treams
inst
e
ad
o
f g
u
av
a
iterations
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
P
e
rformance - remov
e
useless guava transform
a
tion
commit
|
commitdiff
|
tree
2019-07-17
lgoub
e
t
Fix detection of pseudo conf
l
ic
t
s on s
i
ng
l
e-
v
alued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
goubet
Re
g
ressio
n
on
the g
r
oup/
m
atch right-cl
i
ck actions in
S
MW
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Properly descr
i
b
e
what the conflict reso
l
ving actions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
A
dd St
r
uctureMer
g
eVi
e
we
r
custo
m
ization op
t
i
o
ns
commit
|
commitdiff
|
tree
2019-07-16
l
goubet
S
h
o
r
tcut the UM
L
PostProc
e
s
s
or
'
s subset impli
c
ations
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Prevent NPE from overriden
Resource
impl
e
mentations
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Ign
o
re
"
orig
i
nalT
a
r
g
et
O
bjects" from the EMF Compare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgo
u
b
e
t
B
u
mp v
e
r
sions to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgoubet
Ad
a
pt tests
t
o E
G
it chang
e
o
f behavior
commit
|
commitdiff
|
tree
2019-05-29
lgoubet
Enable use
r
s to merge
a
l
l confli
c
t
s at once thro
u
g
h
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lg
o
ubet
Me
r
g
i
n
g
sin
g
le
-
valued con
t
ainment ch
a
n
g
es can lea
d
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Typos
commit
|
commitdiff
|
tree
2019-05-23
l
go
u
b
e
t
Preven
t
LCS c
o
mp
u
tation
when we do not
need
orderin
g
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
l
g
oubet
Prevent duplic
a
te insertio
n
points to be s
h
own in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgo
u
bet
Prev
e
nt CMV disposal when user se
l
ects m
u
ltiple elements
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lg
o
u
b
et
Only add new
a
dapters w
h
e
n
need
e
d
commit
|
commitdiff
|
tree
2019-04-14
lgoubet
I
terate
o
v
e
r
the differe
n
ces inst
e
ad of the matc
h
es
commit
|
commitdiff
|
tree
2019-04-09
lgoubet
P
r
e
vent OutOfMemoryErrors from
t
he
UI when
s
witching CMV
commit
|
commitdiff
|
tree
next