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
Fix release script
2021-07-16
l
g
o
u
b
et
Fix r
e
lease s
c
ript
commit
|
commitdiff
|
tree
2021-07-16
lgo
u
bet
fix r
e
lea
s
e pub
l
i
c
atio
n
script
commit
|
commitdiff
|
tree
2021-07-16
lgoub
e
t
Ad
d
script to publish r
e
leases for JIRO
commit
|
commitdiff
|
tree
2021-07-16
lgou
b
e
t
Fix delete
-
change confli
c
t dete
c
tion (at file level)
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
Pre
v
e
n
t
NPE from the tit
l
e
b
uilder job if ru
n
during
.
.
.
commit
|
commitdiff
|
tree
2021-07-16
lg
o
ubet
Switch to 2021-06 tp and latest EGit ve
r
sion
commit
|
commitdiff
|
tree
2021-02-23
lgoubet
Use Unix li
n
e del
i
mi
t
ers
f
o
r shell
s
cripts
commit
|
commitdiff
|
tree
2021-02-23
lgoub
e
t
Add scr
i
pt to publish mi
l
esto
n
es for JIRO
commit
|
commitdiff
|
tree
2021-02-23
l
goubet
Add nightly pu
b
lication
scrip
t
for JIRO
commit
|
commitdiff
|
tree
2021-02-23
lgoubet
Open ranges
t
o accep
t
G
uava 30
.
1
commit
|
commitdiff
|
tree
2021-02-08
lgoubet
Bump
v
ersion to 3
.
3
.
14
commit
|
commitdiff
|
tree
2021-02-08
lgoubet
Do not close
t
he r
e
po
s
itory when cre
a
t
i
n
g
t
he
EMF merge
.
.
.
commit
|
commitdiff
|
tree
2021-01-05
lg
o
ub
e
t
Poten
t
ial NP
E
commit
|
commitdiff
|
tree
2020-11-24
lgoubet
Make sure folders are cr
e
ated when ex
t
racting
in
p
ut
.
.
.
commit
|
commitdiff
|
tree
2020-11-20
lgoubet
Bump versions to
3
.
3
.
13
commit
|
commitdiff
|
tree
2020-11-19
lgoubet
Do not clos
e
the re
p
ository,
getRe
p
ositoryCache
(
)
.
c
lear
.
.
.
commit
|
commitdiff
|
tree
2020-10-21
lgoub
e
t
Allow loadi
n
g of
m
ode
l
s usin
g
I
D
a
ttribute
s
for comparis
o
n
commit
|
commitdiff
|
tree
2020-10-21
l
g
oub
e
t
Compatib
i
lity
recent mockito
commit
|
commitdiff
|
tree
2020-10-04
lgoubet
O
n
l
y con
s
ider files we've extracted as potential test
.
.
.
commit
|
commitdiff
|
tree
2020-08-31
lgou
b
et
Delete sub-projects first when clean
i
ng up te
s
t workspace
commit
|
commitdiff
|
tree
2020-07-22
lgoubet
Bum
p
V
e
rs
i
o
ns to 3
.
3
.
12
commit
|
commitdiff
|
tree
2020-07-22
lgoubet
Fix name
o
f 2019-12 target
p
latform
commit
|
commitdiff
|
tree
2020-06-26
lg
o
ubet
Fix Git
T
estSupport
commit
|
commitdiff
|
tree
2020-05-26
lgou
b
et
B
ump vers
i
on
s
to 3
.
3
.
11
commit
|
commitdiff
|
tree
2020-04-21
lgoubet
Git
t
est
f
r
a
m
ework failing o
n
w
i
n
d
ows
commit
|
commitdiff
|
tree
2020-01-14
lgoub
e
t
B
u
mp update si
t
es t
o
3
.
3
.
10
commit
|
commitdiff
|
tree
2020-01-14
lgoubet
B
ump EMF Com
p
are
to 3
.
3
.
10 an
d
add 2019-12 target p
l
atf
o
r
m
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
Prevent NPE from the
closing of a Com
p
arison Dialog
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
Compatib
i
li
t
y with
J
Git 5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
Poten
t
ia
l
NPE
w
hen
s
witching files in the compare dial
o
g
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
S
w
itch EMF Compa
r
e to Guava 27
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Re-
e
nable signing and
t
ych
o
-p2-plugin, s
w
it
c
h website
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Build test
i
ng -
d
isable tycho-p2-plugin
commit
|
commitdiff
|
tree
2019-09-25
lgo
u
bet
Bu
i
ld
t
esting -
disable eclipse jarsigner
commit
|
commitdiff
|
tree
2019-09-24
l
g
oubet
EMF Comp
a
r
e
do
c
u
m
entation jar is unsigned
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Replace
G
ua
v
a with Jav
a
8
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Pot
e
ntial rac
e
condition w
h
e
n load
i
ng EPac
k
ages for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Potential NPE w
i
th some imple
m
entations o
f
the propert
y
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lg
o
ubet
Some
i
mplementations of Re
s
ourc
e
.
Diagnostic m
a
y
r
eturn
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
E
MF Co
m
pare
does not support relative xsi:sch
e
maLocat
i
o
n
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
API c
o
m
pat
i
bility
commit
|
commitdiff
|
tree
2019-09-18
lgo
u
b
e
t
R
emove part of gu
a
v
a u
s
es
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Bump to
3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lgo
u
bet
O
p
en the compa
r
e n
a
v
i
gatable
a
s internal API
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Regis
t
er the navigat
a
ble so that the toolbar a
c
tio
n
s
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lgoubet
T
he
n
av
i
gatable's cac
h
e needs to
be cleared w
h
en we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
The Mat
c
h
EngineFact
o
ry
d
oes
n
't
make use of its se
t
t
ers
commit
|
commitdiff
|
tree
2019-09-16
l
goubet
H
a
ppy checkstyl
e
commit
|
commitdiff
|
tree
2019-09-11
lgoubet
Update set
u
p file
commit
|
commitdiff
|
tree
2019-09-10
lgo
u
bet
T
a
rge
t
platform ba
s
e
d
on 2019-06
commit
|
commitdiff
|
tree
2019-09-10
lgou
b
e
t
Behavior change in 2019-
0
6
-
E
xceptions are now in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgoubet
R
emove t
h
e 32
bit platforms
for our
t
arget configurations
commit
|
commitdiff
|
tree
2019-09-06
l
goubet
Index iss
u
e w
h
en merging non-unique attribute
s
' elements
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Diffs
d
epending on pseudo-conflicts
d
o not reject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoub
e
t
MOVE
differences also need to t
a
ke
i
nt
o
acc
o
unt
t
he
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Inaccurate conflict detection for mov
e
s in non-conta
i
nment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Moves wit
h
non-un
i
q
ue values and add
i
tion/deletions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Only M
O
VE di
f
fs need to be igno
r
ed
w
hen
com
p
uti
n
g the LCS
commit
|
commitdiff
|
tree
2019-09-04
l
goubet
Conf
l
ict
d
e
tection
o
n index cha
n
ges must take Fe
a
tureFilter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
M
a
k
e
sure the UI won't try to compute the LCS for huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
The "accept
/
reject
"
all
non-conflicting action s
h
ouldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgo
u
bet
Fix dif
f
, conflict detection
a
nd mergi
n
g of n
o
n-un
i
que
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
l
goubet
Potential out of bo
u
nds exception
commit
|
commitdiff
|
tree
2019-08-27
lgoubet
Co
m
patibility wit
h
jgi
t
5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lg
o
u
bet
Perfo
r
mance - use
D
iffCrossReferencer wh
e
n
p
ossib
l
e
commit
|
commitdiff
|
tree
2019-08-22
l
g
ou
b
et
reg
r
e
ss
i
on - right-click actions on single diff s
e
lec
t
io
n
s
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Open S
M
V API
to allow implementers to acces
s
t
h
e
raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgou
b
et
Prevents excep
t
ions
from being
thrown from th
e
viewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgo
u
bet
Performance - use s
t
reams instead of guava i
t
eration
s
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
l
g
oubet
P
er
f
or
m
an
c
e - remove useless
guava tran
s
fo
r
mati
o
n
commit
|
commitdiff
|
tree
2019-07-17
l
gou
b
et
F
i
x detection of pseudo co
n
flicts on single-val
u
e
d
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgou
b
e
t
Regres
s
i
o
n
on
t
he group/ma
t
c
h
right-cli
c
k actions in
S
MW
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Properly describe
w
hat the conf
l
ict re
s
ol
v
i
n
g
a
ctions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
goubet
Add Stru
c
tureMer
g
e
V
i
ew
e
r cust
o
mization options
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
Sho
r
t
cut th
e
UML
P
ostProcesso
r
's subset
i
mplications
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
g
oubet
Pre
v
ent NPE
from overriden R
e
s
o
u
r
c
e implementations
commit
|
commitdiff
|
tree
2019-07-16
l
goubet
Ign
o
re "o
r
iginalT
a
rg
e
tObjec
t
s" from the EMF Compare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgoubet
Bump versions to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
l
g
o
ubet
Adapt tests to EGit change of
b
ehavior
commit
|
commitdiff
|
tree
2019-05-29
lgoubet
Enable user
s
to m
e
rge
a
ll c
o
nflicts at once
t
hrough
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Merging single-va
l
ued c
o
n
t
a
inment cha
n
g
es can
l
e
ad
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lg
o
u
bet
Typos
commit
|
commitdiff
|
tree
2019-05-23
lg
o
ubet
Prev
e
nt LC
S
c
o
mput
a
tion whe
n
we do not n
e
ed ordering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lg
o
ubet
Pre
v
e
n
t dupli
c
ate insert
i
on points to b
e
show
n
in
tr
e
e
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
l
g
o
ubet
Prevent C
M
V disposal when user s
e
lect
s
multiple elemen
t
s
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgoub
e
t
Only add n
e
w
adapters when needed
commit
|
commitdiff
|
tree
2019-04-14
lgoubet
Iterate over the differe
n
c
e
s instead of the
m
atches
commit
|
commitdiff
|
tree
2019-04-09
l
g
oubet
Prevent OutOfMe
m
oryError
s
from
the UI whe
n
switching
C
M
V
commit
|
commitdiff
|
tree
2019-04-08
lgoube
t
Perform
a
nce
- Com
p
uting requirements ti
m
es
commit
|
commitdiff
|
tree
2019-04-08
l
gou
b
e
t
The UML te
s
ts sh
o
uldn'
t
use a
c
a
ch
e
d
inst
a
nce of EMFCompare
commit
|
commitdiff
|
tree
2019-04-03
lgoub
e
t
R
estore possib
i
lity
t
o rem
o
v
e me
r
gers from the reg
i
stry
commit
|
commitdiff
|
tree
2019-03-22
lg
o
ubet
Make su
r
e
we h
o
o
k
t
he UI whe
n
user
s
p
rovide a precompu
t
ed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Bu
m
p E
M
F Compare to 3
.
3
.
7 in preparation for 201
9
-06
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Disposing of the comparison shouldn't
be done b
y
the SMV
commit
|
commitdiff
|
tree
2019-03-04
lgo
u
bet
A
v
oid ClassCas
t
Excepti
o
n wh
e
n
m
e
r
ging feature m
a
p
c
h
anges
commit
|
commitdiff
|
tree
2019-02-26
l
g
oubet
Bu
m
p
versions for 3
.
3
.
6
for 20
1
9-03
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
patch
M
o
d
e
l
GitMergeE
d
i
t
orI
n
put for EG
i
t 5
.
3
.
0 compatibili
t
y
commit
|
commitdiff
|
tree
2019-02-26
lg
o
ubet
Suppress g
u
ava nested
c
oncaten
a
tio
n
s
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Remove accidental
u
se of G
u
ava
commit
|
commitdiff
|
tree
2019-02-11
lgoub
e
t
S
WTException w
h
en switch
i
ng com
p
arisons in a compare
.
.
.
commit
|
commitdiff
|
tree
next