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
Cannot merge added/deleted resources
2021-10-14
lgoubet
Can
n
ot merge added/deleted resources
commit
|
commitdiff
|
tree
2021-10-07
lgoube
t
Bump ve
r
s
ion to 3
.
3
.
1
6
commit
|
commitdiff
|
tree
2021-10-07
lgoubet
swi
t
ch
t
o
lat
e
st
jarsigner
commit
|
commitdiff
|
tree
2021-10-07
lgo
u
bet
2021-
0
9 t
p
+ 2021-1
2
milesto
n
e of EGi
t
to cop
e
with
.
.
.
commit
|
commitdiff
|
tree
2021-07-20
lgoubet
change visibili
t
y of the re
s
ol
u
tio
n
conte
x
t
commit
|
commitdiff
|
tree
2021-07-19
lgoubet
Bum
p
version
to 3
.
3
.
15
commit
|
commitdiff
|
tree
2021-07-19
l
goubet
En
a
bl
e
diagr
a
m post
p
r
ocessor
f
or GMF 1
.
10
an
d
above
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
Fi
x
r
e
lease
s
c
r
ipt
commit
|
commitdiff
|
tree
2021-07-16
l
g
o
u
bet
fix release public
a
tio
n
scrip
t
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
Add script to
p
ub
l
is
h
releases
f
or
J
I
RO
commit
|
commitdiff
|
tree
2021-07-16
lgoub
e
t
Fix delete
-
change confl
i
ct d
e
tect
i
on (at file
l
e
v
el)
commit
|
commitdiff
|
tree
2021-07-16
lgo
u
bet
Prevent NPE from the title b
u
ilder
j
ob if
r
un du
r
ing
.
.
.
commit
|
commitdiff
|
tree
2021-07-16
lgoube
t
Switch t
o
20
2
1-06 tp and latest EGit
v
er
s
ion
commit
|
commitdiff
|
tree
2021-02-23
l
g
oubet
Use
U
n
i
x line delimiters f
o
r shell scripts
commit
|
commitdiff
|
tree
2021-02-23
l
g
oubet
Add script to publish mil
e
st
o
n
e
s f
o
r JIRO
commit
|
commitdiff
|
tree
2021-02-23
lgou
b
et
Add nightly pub
l
i
c
a
t
i
o
n script
f
or JIRO
commit
|
commitdiff
|
tree
2021-02-23
lgo
u
bet
Open ranges
t
o acce
p
t Guava 30
.
1
commit
|
commitdiff
|
tree
2021-02-08
l
g
oubet
Bump version to
3
.
3
.
14
commit
|
commitdiff
|
tree
2021-02-08
lgou
b
et
Do not clo
s
e
t
h
e r
e
positor
y
wh
e
n c
r
ea
t
ing
th
e
E
M
F
me
r
ge
.
.
.
commit
|
commitdiff
|
tree
2021-01-05
lgoubet
Potential NPE
commit
|
commitdiff
|
tree
2020-11-24
lgoube
t
Make sure
folders a
r
e cr
e
ated
wh
e
n extracting input
.
.
.
commit
|
commitdiff
|
tree
2020-11-20
lgoubet
Bump ve
r
sions
to 3
.
3
.
13
commit
|
commitdiff
|
tree
2020-11-19
lgoubet
Do not
c
lo
s
e the repository
,
get
R
ep
o
si
t
oryCache()
.
clea
r
.
.
.
commit
|
commitdiff
|
tree
2020-10-21
lgou
b
et
Allow loading of models using ID attributes
for c
o
mparison
commit
|
commitdiff
|
tree
2020-10-21
lgo
u
bet
Compati
b
ility rece
n
t mockito
commit
|
commitdiff
|
tree
2020-10-04
lgoub
e
t
Only
c
onsider files we've extracted as potent
i
al test
.
.
.
commit
|
commitdiff
|
tree
2020-08-31
lgo
u
be
t
Delete s
u
b-projec
t
s fi
r
st when c
l
eaning up test works
p
ace
commit
|
commitdiff
|
tree
2020-07-22
l
goube
t
Bump Versions
to
3
.
3
.
12
commit
|
commitdiff
|
tree
2020-07-22
lgoubet
Fix nam
e
of 2019-
1
2 targ
e
t platf
o
rm
commit
|
commitdiff
|
tree
2020-06-26
lgoubet
Fix GitTestSupport
commit
|
commitdiff
|
tree
2020-05-26
l
go
u
b
et
Bump
vers
i
ons
t
o 3
.
3
.
11
commit
|
commitdiff
|
tree
2020-04-21
l
goubet
Git test frame
w
ork failing on windows
commit
|
commitdiff
|
tree
2020-01-14
lgoubet
Bump update site
s
to 3
.
3
.
10
commit
|
commitdiff
|
tree
2020-01-14
lgoubet
Bump E
M
F Comp
a
re to 3
.
3
.
10
and
add 2019-1
2
t
a
r
ge
t
platform
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
Preve
n
t N
P
E from th
e
clos
i
ng
of a
Comparison Dialog
commit
|
commitdiff
|
tree
2020-01-06
l
goubet
Compatibil
i
ty
w
ith JGi
t
5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lgoub
e
t
Potential NPE
w
hen swit
c
hing files
in the compare dialog
commit
|
commitdiff
|
tree
2019-11-05
l
g
o
ub
e
t
Sw
i
tch EMF
C
omp
a
re to Guava
27
commit
|
commitdiff
|
tree
2019-09-25
lgoub
e
t
Re-enable
s
ignin
g
and tyc
h
o-p2-plugin, sw
i
t
c
h
webs
i
te
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Build t
e
sting -
disable tych
o
-
p
2-plugin
commit
|
commitdiff
|
tree
2019-09-25
l
g
o
u
bet
Build testin
g
- dis
a
b
l
e eclipse
j
a
rsigner
commit
|
commitdiff
|
tree
2019-09-24
lgou
b
et
E
M
F Comp
a
re documentation jar is
unsigne
d
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Repl
a
ce Guava with Java 8
commit
|
commitdiff
|
tree
2019-09-19
l
goub
e
t
P
o
tential race cond
i
tio
n
wh
e
n loading E
P
ackages for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoube
t
Po
t
e
n
t
ial NPE with some imp
l
em
e
ntations
o
f the
property
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Some
i
mplem
e
n
t
a
tions of Resource
.
Diagn
o
stic may re
t
ur
n
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
EMF Co
m
p
a
re does
no
t
s
u
p
p
o
rt relative xsi
:
schemaLocation
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
A
PI compat
i
bility
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Remov
e
par
t
o
f
guava
u
s
es
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Bump to 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lgoube
t
Open the
c
ompare navigatabl
e
as interna
l
API
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Register th
e
naviga
t
ab
l
e
so that
t
he toolbar
a
c
tions
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lgoub
e
t
The navigata
b
le's cache needs to be cleared
w
hen we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
T
h
e
MatchEng
i
n
e
Fa
c
tory doesn'
t
make use of its se
t
ters
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
Happy checkstyle
commit
|
commitdiff
|
tree
2019-09-11
lgoubet
Update setup
fil
e
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
T
arg
e
t platform base
d
on
2
0
19-06
commit
|
commitdiff
|
tree
2019-09-10
l
g
o
ubet
Beh
a
v
i
or change in 2019-06 - Exceptions
a
re now in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgoub
e
t
Remove
the 3
2
b
it platform
s
for
o
ur targ
e
t
configurations
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Index issue whe
n
merging non
-
unique att
r
ibut
e
s'
e
lements
commit
|
commitdiff
|
tree
2019-09-06
lgo
u
bet
Diffs
d
e
pending
o
n pse
u
do-conflicts do n
o
t
reject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
MO
V
E diffe
r
en
c
es also need
t
o take
into ac
c
o
u
nt the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lg
o
u
b
et
Inaccu
r
ate conflict detectio
n
for move
s
in non-contai
n
ment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lg
o
u
b
et
Mov
e
s with non-u
n
ique val
u
es
and addition/d
e
letions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
l
goubet
Only MOVE dif
f
s ne
e
d to b
e
igno
r
ed
when computi
n
g the LCS
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
C
onflic
t
d
etection o
n
inde
x
cha
n
ge
s
must take FeatureFilter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
l
goubet
Make sure the UI
w
o
n't tr
y
t
o
compute the LCS for huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
T
he "accept/reject
"
all non-c
o
nflicting action should
n
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lg
o
ubet
Fix
d
i
ff, conflict detection and merging of non
-
unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgou
b
et
Potential out
o
f bounds
exception
commit
|
commitdiff
|
tree
2019-08-27
lgoubet
Compat
i
bilit
y
wit
h
jgi
t
5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
Performance - use DiffCrossReference
r
whe
n
p
oss
i
ble
commit
|
commitdiff
|
tree
2019-08-22
l
goubet
r
e
gressi
o
n - right-click actions on single dif
f
selections
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Ope
n
SMV API to allow implementers to acces
s
the raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Prevents
except
i
o
ns from being thrown from t
h
e view
e
r
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
P
e
rformanc
e
-
u
se streams ins
t
ead of gu
a
va i
t
erations
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgo
u
b
et
Performance - remove useless gua
v
a transformation
commit
|
commitdiff
|
tree
2019-07-17
lgoubet
Fi
x
detec
t
ion of pseudo confli
c
ts on single-valu
e
d
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Regr
e
ssi
o
n
o
n the gro
u
p/match right-
c
lick action
s
in SMW
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Properl
y
descr
i
b
e what the conflic
t
resolving a
c
tions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Add
S
tructureMerg
e
Viewer customization
o
pti
o
ns
commit
|
commitdiff
|
tree
2019-07-16
lgo
u
be
t
Sho
r
tcut the UMLPostProces
s
or's s
u
bset i
m
plicati
o
n
s
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Prevent NPE
fr
o
m overriden Res
o
urce implementation
s
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
Ignore "
o
rigin
a
lTargetObject
s
"
f
r
o
m the
EMF Co
m
pare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
l
g
oubet
Bump versions to
3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgo
u
b
et
Ad
a
p
t
tes
t
s
to EGit
c
h
an
g
e of be
h
avi
o
r
commit
|
commitdiff
|
tree
2019-05-29
l
g
oubet
Enab
l
e
u
sers to
merge
all conflicts at
o
n
c
e through
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
l
g
oubet
Merging single-v
a
lued cont
a
i
nme
n
t changes can lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
l
g
oubet
Typo
s
commit
|
commitdiff
|
tree
2019-05-23
lgoube
t
Prevent LC
S
computation when we
d
o
not need ordering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
l
g
o
u
bet
Prevent dupli
c
ate
inse
r
tion points to
b
e
shown in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgoubet
Preve
n
t CMV disposal when use
r
selects multiple elem
e
nts
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgoubet
Only
a
dd new ada
p
t
ers
w
hen
needed
commit
|
commitdiff
|
tree
2019-04-14
lg
o
ube
t
I
t
erat
e
o
v
er
the differences instead
of
the matches
commit
|
commitdiff
|
tree
2019-04-09
lgoubet
Prevent
O
u
t
O
f
M
emoryErrors fr
o
m the
U
I when switchin
g
CMV
commit
|
commitdiff
|
tree
2019-04-08
lg
o
ubet
P
e
rformance -
C
omputing req
u
irements ti
m
es
commit
|
commitdiff
|
tree
2019-04-08
l
g
o
u
be
t
The
U
M
L
tests sh
o
u
l
dn't use a c
a
c
h
e
d instance
o
f
EMFCompare
commit
|
commitdiff
|
tree
2019-04-03
lgoubet
Restore possibility to
remove mergers from the reg
i
s
try
commit
|
commitdiff
|
tree
2019-03-22
lgoubet
Make sure we h
o
ok the UI when users
p
rovide a precom
p
uted
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
B
ump EMF Comp
a
re to 3
.
3
.
7 in preparation fo
r
2019-06
commit
|
commitdiff
|
tree
next