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
Bump version to 3.3.18
2022-02-07
lgoubet
B
ump vers
i
on
to
3
.
3
.
18
commit
|
commitdiff
|
tree
2021-11-29
lgoubet
Remove outda
t
ed tar
g
e
t
p
l
a
t
f
orm
s
commit
|
commitdiff
|
tree
2021-11-29
lgoub
e
t
Bump versio
n
t
o
3
.
3
.
1
7
commit
|
commitdiff
|
tree
2021-11-25
Eike Stepper
[5770
0
0] Com
p
ari
s
on
.
getMatch(
e
) can return null and
.
.
.
commit
|
commitdiff
|
tree
2021-10-19
lg
o
u
b
et
Allow
c
onfiguration of
th
e
model provide
r
's ca
c
he ex
p
iration
.
.
.
commit
|
commitdiff
|
tree
2021-10-18
lgoubet
Retrieve all
fixes f
r
om the EGit t
e
am in
th
e
MergeEdit
o
rInput
commit
|
commitdiff
|
tree
2021-10-18
lgoubet
E
MF Compa
r
e needs compatib
i
lit
y
with both EGit 5 and 6
commit
|
commitdiff
|
tree
2021-10-14
lgoubet
C
a
nnot merge added/deleted resources
commit
|
commitdiff
|
tree
2021-10-07
lgoubet
Bump
ve
r
si
o
n
to 3
.
3
.
16
commit
|
commitdiff
|
tree
2021-10-07
l
gou
b
et
swi
t
ch to la
t
est jar
s
igner
commit
|
commitdiff
|
tree
2021-10-07
lgou
b
e
t
2
0
21-09 tp +
2021
-
12 milestone of
E
Git to cope w
i
th
.
.
.
commit
|
commitdiff
|
tree
2021-07-20
lgoubet
change vis
i
bilit
y
of the
resolution conte
x
t
commit
|
commitdiff
|
tree
2021-07-19
lgoubet
Bump version to
3
.
3
.
15
commit
|
commitdiff
|
tree
2021-07-19
lgoubet
Enable diagra
m
post processo
r
for GMF 1
.
1
0
and
above
commit
|
commitdiff
|
tree
2021-07-16
lgoube
t
F
i
x r
e
lease script
commit
|
commitdiff
|
tree
2021-07-16
lg
o
u
bet
fix releas
e
pub
l
ication script
commit
|
commitdiff
|
tree
2021-07-16
lg
o
u
b
e
t
Add script to pu
b
l
is
h
r
ele
a
se
s
for JIRO
commit
|
commitdiff
|
tree
2021-07-16
l
goubet
Fix d
e
lete
-
change conflict detection (at file level)
commit
|
commitdiff
|
tree
2021-07-16
l
g
oube
t
P
r
event NPE
f
rom the title
build
e
r
job if
r
un during
.
.
.
commit
|
commitdiff
|
tree
2021-07-16
lgo
u
bet
Switch to 2021-06
tp a
n
d latest
E
Git ver
s
ion
commit
|
commitdiff
|
tree
2021-02-23
lgo
u
bet
Use Uni
x
line delimiters for shell script
s
commit
|
commitdiff
|
tree
2021-02-23
lgoubet
Add script
to
p
ublish mil
e
stone
s
for JIRO
commit
|
commitdiff
|
tree
2021-02-23
lgoub
e
t
Ad
d
nightly
pub
l
ication script
for JIRO
commit
|
commitdiff
|
tree
2021-02-23
lg
o
ubet
Open ranges
t
o accept Guava
3
0
.
1
commit
|
commitdiff
|
tree
2021-02-08
lgoubet
Bump versio
n
t
o 3
.
3
.
14
commit
|
commitdiff
|
tree
2021-02-08
lgou
b
e
t
Do not c
l
ose the r
e
p
o
sito
r
y when cr
e
a
ting the EMF
merge
.
.
.
commit
|
commitdiff
|
tree
2021-01-05
lgoubet
P
o
t
ential NPE
commit
|
commitdiff
|
tree
2020-11-24
lgo
u
bet
Make sure folders are created when ex
t
racting inpu
t
.
.
.
commit
|
commitdiff
|
tree
2020-11-20
lg
o
ubet
B
u
mp versi
o
ns to 3
.
3
.
13
commit
|
commitdiff
|
tree
2020-11-19
lgoubet
Do not close the r
e
posi
t
ory, getRepositoryCache()
.
c
l
e
a
r
.
.
.
commit
|
commitdiff
|
tree
2020-10-21
lgoubet
Allow loading o
f
models using ID attribute
s
for co
m
pa
r
is
o
n
commit
|
commitdiff
|
tree
2020-10-21
lgo
u
bet
Compatibility rec
e
n
t
mockito
commit
|
commitdiff
|
tree
2020-10-04
l
g
oubet
Onl
y
conside
r
files w
e
've extracted as potenti
a
l
tes
t
.
.
.
commit
|
commitdiff
|
tree
2020-08-31
lgoubet
D
e
le
t
e sub-proj
e
cts firs
t
when cleanin
g
u
p
t
e
s
t
work
s
pace
commit
|
commitdiff
|
tree
2020-07-22
lg
o
ubet
Bump Versions to 3
.
3
.
12
commit
|
commitdiff
|
tree
2020-07-22
lgoubet
Fix name of 2
0
19-12 target platform
commit
|
commitdiff
|
tree
2020-07-01
Glenn Plouhinec
[56
4
6
80]
I
mpr
o
v
ed diagra
m
d
i
splay
.
commit
|
commitdiff
|
tree
2020-06-26
lgo
u
b
e
t
Fix GitTestSup
p
ort
commit
|
commitdiff
|
tree
2020-05-26
lgoubet
Bu
m
p
version
s
t
o
3
.
3
.
11
commit
|
commitdiff
|
tree
2020-04-21
Gl
e
nn Plouhine
c
[561825] Merge a
S
irius Node d
o
esn't m
e
rg
e
"
actualMappin
g
.
.
.
commit
|
commitdiff
|
tree
2020-04-21
lgou
b
et
Git te
s
t framework failing on w
i
ndows
commit
|
commitdiff
|
tree
2020-01-14
lg
o
ubet
Bump update
sites to 3
.
3
.
10
commit
|
commitdiff
|
tree
2020-01-14
lgoubet
Bump EMF Co
m
pare to 3
.
3
.
10 and add 201
9
-12
t
ar
g
e
t
p
latform
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
Prevent NP
E
from the clos
i
ng o
f
a Comparison Di
a
lo
g
commit
|
commitdiff
|
tree
2020-01-06
lgo
u
bet
C
o
mpa
t
ibility wi
t
h
JG
i
t 5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
P
ote
n
tial NPE when s
w
itching
f
il
e
s in the
c
ompare dialog
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
Switch EMF Compar
e
t
o
Guava 27
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Re-enable signing
a
nd t
y
cho-p
2
-plu
g
in, switch website
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Build testing
- disable tycho-
p
2-p
l
ugin
commit
|
commitdiff
|
tree
2019-09-25
lgo
u
bet
B
uild testing - disable eclipse jarsign
e
r
commit
|
commitdiff
|
tree
2019-09-24
lgoubet
EMF Compa
r
e
d
o
c
ument
a
tion jar is unsigned
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Replace Guava with
J
ava 8
commit
|
commitdiff
|
tree
2019-09-19
lgoube
t
Pote
n
t
i
al
race
c
ondition when loading EPackages for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoub
e
t
Potential NPE with so
m
e impleme
n
t
a
tions of th
e
pro
p
erty
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgo
u
bet
Some
i
mplementations of Resource
.
Diagnostic may return
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
EMF
C
ompare does n
o
t
support re
l
a
t
ive xsi:schemaLocation
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
A
P
I compatibility
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Remov
e
part of
gu
a
v
a
uses
commit
|
commitdiff
|
tree
2019-09-18
lg
o
ube
t
Bump to 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lgou
b
et
Open
th
e
compare na
v
iga
t
able as
i
nternal
API
commit
|
commitdiff
|
tree
2019-09-18
lgo
u
b
et
R
e
gister the navigatabl
e
so that the too
l
bar action
s
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lgoubet
The n
a
vigatable's cache
n
eeds
t
o be c
l
eared
when we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lgoub
e
t
The MatchEn
g
ineF
a
cto
r
y doesn't make use of i
t
s setters
commit
|
commitdiff
|
tree
2019-09-16
lgou
b
et
Happy checkstyl
e
commit
|
commitdiff
|
tree
2019-09-11
lgoubet
Update setup file
commit
|
commitdiff
|
tree
2019-09-10
l
g
ou
b
e
t
Target plat
f
orm based on
2019
-
0
6
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Beh
a
vior change in 2019-06
- Exception
s
are now
in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
l
g
oubet
Remove the 32 bi
t
pl
a
tforms for our target conf
i
guratio
n
s
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Index issue
w
hen
merging non-unique attr
i
but
e
s' elements
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Diffs depe
n
ding on pseudo-confli
c
ts do not reject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgo
u
bet
MOVE diffe
r
ences also need to take into accou
n
t the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoub
e
t
Inaccur
a
te
c
onflict detection fo
r
moves
i
n non-containment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Mo
v
e
s with non-unique val
u
e
s and additi
o
n/deletions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
O
n
ly MOVE diff
s
need to be ig
n
ored wh
e
n com
p
ut
i
ng
t
he
L
CS
commit
|
commitdiff
|
tree
2019-09-04
l
g
oubet
Conflict detecti
o
n
o
n
index
c
h
anges mu
s
t take F
e
a
t
ureFilter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoub
e
t
M
ake sure th
e
UI won't try
to compute th
e
LC
S
f
or
huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
The "ac
c
ept/reject
"
a
ll non-conflicting a
c
tion shouldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
Fix d
i
ff, c
o
nflict
detection and me
r
ging of non-unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoub
e
t
Po
t
ential out of
bounds exception
commit
|
commitdiff
|
tree
2019-08-27
l
g
oubet
Compatibility
with
jgit 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lg
o
ubet
P
e
rforma
n
ce - u
s
e DiffCrossReferencer wh
e
n possible
commit
|
commitdiff
|
tree
2019-08-22
lgou
b
et
regression - rig
h
t-click action
s
o
n sing
l
e
d
iff selecti
o
n
s
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Open
S
M
V API to allow
i
m
p
lementers to ac
c
ess the
raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgou
b
et
Prev
e
nts exceptions from
being thrown
f
r
om the viewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
P
e
rformanc
e
- use st
r
eams i
n
st
e
ad of gua
v
a
i
ter
a
t
i
ons
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgo
u
bet
Pe
r
f
o
rmance
-
remo
v
e use
l
ess guava tr
a
n
sformation
commit
|
commitdiff
|
tree
2019-07-17
Chri
s
tian W
.
Damus
[52208
0
] [UML]
A
dd-add conflicts in stereo
t
y
pe applicatio
n
.
.
.
commit
|
commitdiff
|
tree
2019-07-17
lgoubet
Fix detection of pse
u
do conflicts on single-valued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Regression on the
g
r
oup/match right-click action
s
i
n
SMW
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Properly describe
what the confl
i
ct resolving a
c
tion
s
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Martin
Fleck
[
5
0
6
928] ComparisonScopeEditorIn
p
u
t does not respect
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Stefan Dirix
Can
c
el Faster in P
r
oximityEObje
c
tMatc
h
er
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
Add StructureMergeViewer cus
t
omizatio
n
opt
i
o
n
s
commit
|
commitdiff
|
tree
2019-07-16
l
goubet
Shortcut
the UMLPostProcessor's subset imp
l
ications
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Axel Richard
A
ctivation of all Git tests
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Pre
v
ent N
P
E from overriden Re
s
ou
r
ce i
m
plementations
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
Ignore "original
T
ar
g
e
t
Obj
e
cts" from the EMF Compa
r
e
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgoub
e
t
Bump ver
s
ions to
3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
William Pi
e
rs
Enab
l
ed "accept change" ac
t
ion on multiple dif
f
selection
commit
|
commitdiff
|
tree
2019-07-04
lgoubet
Adapt tests to
EGit change of
b
ehavior
commit
|
commitdiff
|
tree
next