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
Re
m
ove o
u
t
dated tar
g
e
t
platf
o
rm
s
commit
|
commitdiff
|
tree
2021-11-29
l
g
oubet
Bump version to 3
.
3
.
1
7
commit
|
commitdiff
|
tree
2021-10-19
lgoubet
Allow configurati
o
n of
the
model
p
rovider'
s
cac
h
e expiration
.
.
.
commit
|
commitdiff
|
tree
2021-10-18
l
g
oubet
Retr
i
eve
all
f
i
xes
from
th
e
EGit team in the MergeEditorInp
u
t
commit
|
commitdiff
|
tree
2021-10-18
lgoubet
EMF Com
p
are
n
e
e
d
s co
m
pa
t
ibility wit
h
both EGit 5 and 6
commit
|
commitdiff
|
tree
2021-10-14
lgoubet
Cannot
m
erge added/
d
eleted res
o
urces
commit
|
commitdiff
|
tree
2021-10-07
l
g
o
ub
e
t
Bump ve
r
sio
n
to 3
.
3
.
16
commit
|
commitdiff
|
tree
2021-10-07
lgoubet
sw
i
tch to lates
t
jarsigner
commit
|
commitdiff
|
tree
2021-10-07
lgoubet
202
1
-09 tp
+
2021-12 mi
l
e
s
tone of
E
Git t
o
cope with
.
.
.
commit
|
commitdiff
|
tree
2021-07-20
lgoubet
change visibility o
f
the resolution conte
x
t
commit
|
commitdiff
|
tree
2021-07-19
lgo
u
b
e
t
Bump ver
s
io
n
to 3
.
3
.
1
5
commit
|
commitdiff
|
tree
2021-07-19
lgoubet
E
n
able diagram post p
r
ocessor
f
o
r GMF 1
.
10 and above
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
Fix re
l
ease scri
p
t
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
fix relea
s
e
p
ublication sc
r
ipt
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
A
dd sc
r
ip
t
t
o
pu
b
lish release
s
fo
r
JI
R
O
commit
|
commitdiff
|
tree
2021-07-16
lg
o
ubet
Fix delete-change conflict
d
et
e
ctio
n
(at f
i
le
l
evel)
commit
|
commitdiff
|
tree
2021-07-16
lgo
u
bet
Prevent N
P
E from the titl
e
b
u
ilder
j
o
b if r
u
n during
.
.
.
commit
|
commitdiff
|
tree
2021-07-16
l
go
u
bet
Switch to 2021-06 tp and latest E
G
i
t
version
commit
|
commitdiff
|
tree
2021-02-23
lgoubet
Use Unix line
d
el
i
miters for shell scripts
commit
|
commitdiff
|
tree
2021-02-23
lgoubet
Add scr
i
pt
to
pu
b
lish miles
t
ones f
o
r JIRO
commit
|
commitdiff
|
tree
2021-02-23
lgoube
t
Add
nightly pu
b
licatio
n
scri
p
t f
o
r JIRO
commit
|
commitdiff
|
tree
2021-02-23
lgoubet
Ope
n
r
a
nges to accept Guava 30
.
1
commit
|
commitdiff
|
tree
2021-02-08
lgoubet
B
u
mp version
t
o 3
.
3
.
14
commit
|
commitdiff
|
tree
2021-02-08
lgoubet
Do no
t
close the repository
w
h
en creating the EMF me
r
ge
.
.
.
commit
|
commitdiff
|
tree
2021-01-05
lgoubet
Pot
e
ntial NPE
commit
|
commitdiff
|
tree
2020-11-24
lgoubet
Make
s
ure folders are created when extra
c
ting input
.
.
.
commit
|
commitdiff
|
tree
2020-11-20
lgoubet
B
um
p
versions
to
3
.
3
.
1
3
commit
|
commitdiff
|
tree
2020-11-19
lgoubet
Do
n
ot clos
e
the r
e
posi
t
ory, getRe
p
ositoryCac
h
e()
.
c
lear
.
.
.
commit
|
commitdiff
|
tree
2020-10-21
lgoubet
Allow
loadi
n
g
of m
o
d
e
ls using ID at
t
ri
b
ut
e
s for comparison
commit
|
commitdiff
|
tree
2020-10-21
lgoubet
Com
p
atibility r
e
cent mockito
commit
|
commitdiff
|
tree
2020-10-04
l
g
oubet
Only conside
r
fil
e
s we've ex
t
ra
c
ted
as potential test
.
.
.
commit
|
commitdiff
|
tree
2020-08-31
lgoubet
D
e
lete sub-
p
rojects first when
c
leaning up tes
t
workspace
commit
|
commitdiff
|
tree
2020-07-22
lgoubet
Bump Vers
i
ons to
3
.
3
.
12
commit
|
commitdiff
|
tree
2020-07-22
lgoubet
Fix name
of 2019-
1
2 target platf
o
rm
commit
|
commitdiff
|
tree
2020-06-26
lg
o
ubet
Fix GitTestSupport
commit
|
commitdiff
|
tree
2020-05-26
lgou
b
et
Bump ver
s
ions to 3
.
3
.
11
commit
|
commitdiff
|
tree
2020-04-21
l
g
oub
e
t
Git
te
s
t fram
e
w
ork
f
ailing on windows
commit
|
commitdiff
|
tree
2020-01-14
lgoube
t
Bump
u
pdate
s
i
tes
t
o 3
.
3
.
10
commit
|
commitdiff
|
tree
2020-01-14
lgou
b
e
t
Bu
m
p EMF Compare
t
o
3
.
3
.
10 and add 2019-12 target platform
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
Prevent NPE
from the closin
g
of a Comparison Di
a
log
commit
|
commitdiff
|
tree
2020-01-06
lgoub
e
t
Compat
i
bility with JGit 5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
P
o
t
ential NP
E
w
hen swi
t
ching files in the compar
e
dialog
commit
|
commitdiff
|
tree
2019-11-05
l
g
oub
e
t
Switch
E
MF
C
ompare to
G
uava 27
commit
|
commitdiff
|
tree
2019-09-25
lgo
u
bet
Re-enable
s
igning a
n
d tycho-p2-pl
u
gin,
swi
t
ch website
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Build testing
- disable
tycho-p2-plugin
commit
|
commitdiff
|
tree
2019-09-25
lgoube
t
Build testing - disable
e
clipse jar
s
i
gner
commit
|
commitdiff
|
tree
2019-09-24
lgou
b
et
EMF C
o
m
pare d
o
cum
e
n
tation
ja
r
is un
s
igned
commit
|
commitdiff
|
tree
2019-09-19
lgoub
e
t
Replace Guava
with Java 8
commit
|
commitdiff
|
tree
2019-09-19
l
goubet
Po
t
en
t
ial
r
a
c
e condition
when
l
oading EPackages for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Poten
t
i
a
l
N
PE
w
i
th so
m
e impl
e
m
e
n
tations of the property
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
S
o
me
implementations of Resource
.
Diagn
o
stic may
r
eturn
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lg
o
ubet
EMF
Compare does not supp
o
r
t
r
elativ
e
xsi:schemaLocat
i
o
n
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgo
u
bet
API compati
b
ility
commit
|
commitdiff
|
tree
2019-09-18
lg
o
ube
t
Remove part of guava uses
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Bump to 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Open the com
p
are naviga
t
a
ble as in
t
ernal A
P
I
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Register the navi
g
atab
l
e
so that th
e
toolbar act
i
ons
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lgoubet
The navigatabl
e
's c
a
che needs to be clea
r
ed when we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
Th
e
MatchE
n
gin
e
F
actor
y
d
oesn't make use of its setters
commit
|
commitdiff
|
tree
2019-09-16
lgou
b
et
Happy checkstyle
commit
|
commitdiff
|
tree
2019-09-11
lg
o
ubet
U
p
date setup file
commit
|
commitdiff
|
tree
2019-09-10
lgoub
e
t
Target
platform based on 201
9
-
06
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Behav
i
or change in 2019-0
6
- Exceptions are
n
ow in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgoubet
Remove
t
he 32 bit plat
f
orms for our target configurations
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Index iss
u
e when me
r
gi
n
g non
-
unique att
r
ibutes' element
s
commit
|
commitdiff
|
tree
2019-09-06
lgoub
e
t
Diffs depe
n
d
ing on pseu
d
o
-
confl
i
cts d
o
n
o
t
reject
t
he
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgo
u
bet
MOVE differences also need to take into account the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Inaccurat
e
co
n
flict detection for
m
o
v
e
s
in non-containm
e
nt
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Moves with n
o
n-unique val
u
e
s
a
nd addition/deletions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Only MOVE diffs need to
b
e ignored
when computing the
L
CS
commit
|
commitdiff
|
tree
2019-09-04
lgou
b
et
Con
f
l
ict detection
o
n ind
e
x change
s
must
t
ake Feature
F
ilter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgo
u
bet
Make su
r
e the UI won'
t
try to com
p
ut
e
the LCS for
huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
T
he "accept/reject" all
non
-
conflicting ac
t
ion s
h
ouldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
Fix di
f
f, conf
l
ict detection and merging of no
n
-unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgou
b
et
Potential
out of bou
n
d
s exception
commit
|
commitdiff
|
tree
2019-08-27
l
goubet
Compatibility w
i
th jgit 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgou
b
et
Performance -
u
s
e
DiffCrossRefere
n
cer when possible
commit
|
commitdiff
|
tree
2019-08-22
l
g
oub
e
t
reg
r
ession -
righ
t
-clic
k
a
ctions on single diff
s
electi
o
ns
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
l
gou
b
e
t
Open SMV API
t
o
allow impl
e
menters to a
c
cess the raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lg
o
ubet
Prevents
exceptions from
b
ein
g
thrown fr
o
m
t
he viewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
Performanc
e
- use streams instead of
g
uava i
t
erations
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
Performa
n
ce - remo
v
e u
s
e
l
e
ss
g
u
ava tran
s
formation
commit
|
commitdiff
|
tree
2019-07-17
lgoubet
F
i
x
detection of pseudo c
o
nflicts on si
n
gle-v
a
lued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
R
e
g
r
e
ssion on the
g
r
oup/match r
i
gh
t
-click action
s
i
n
SMW
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Properly des
c
ri
b
e what the conflict resolvi
n
g actions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Add
S
tructu
r
eMe
r
geViewer
c
ustom
i
zatio
n
opt
i
ons
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
S
h
ortc
u
t
the
U
M
LPostProcessor
'
s
s
ubs
e
t implications
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoube
t
Prev
e
nt NP
E
fr
o
m overriden Resour
c
e
implement
a
ti
o
ns
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Ignore "or
i
gi
n
alTargetObjects" from the EMF
C
ompa
r
e
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lg
o
u
b
et
Bump version
s
to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgoubet
A
dapt t
e
st
s
to EG
i
t change of
b
ehavior
commit
|
commitdiff
|
tree
2019-05-29
lgoubet
E
nable
u
sers to merge
a
ll confli
c
ts at
once t
h
rough
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lg
o
ubet
M
erging sing
l
e
-valued con
t
ainment
c
hanges can le
a
d
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
T
ypos
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Prevent
L
CS c
o
m
p
utation
w
he
n
we
d
o not ne
e
d orderi
n
g
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
l
go
u
bet
Prevent duplicate i
n
sertion poin
t
s to
b
e sh
o
wn in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgo
u
bet
Prevent CMV disposal wh
e
n user select
s
multiple e
l
em
e
nts
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgo
u
b
e
t
Only add new a
d
apte
r
s when needed
commit
|
commitdiff
|
tree
2019-04-14
lgou
b
et
Iterate
over the differences inst
e
a
d of the matches
commit
|
commitdiff
|
tree
2019-04-09
l
go
u
bet
Preven
t
OutOfMemoryErrors from
t
he
UI when switching CMV
commit
|
commitdiff
|
tree
next