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.15
2021-07-19
lgoubet
Bump version to
3
.
3
.
15
commit
|
commitdiff
|
tree
2021-07-19
lgoubet
En
a
ble d
i
ag
r
am post processor
f
or GMF 1
.
10 and abov
e
commit
|
commitdiff
|
tree
2021-07-16
l
g
oubet
Fix
r
e
lease
script
commit
|
commitdiff
|
tree
2021-07-16
lgoub
e
t
fix release publica
t
i
o
n script
commit
|
commitdiff
|
tree
2021-07-16
l
g
oubet
Add sc
r
ipt to p
u
blish
r
el
e
a
ses for JIRO
commit
|
commitdiff
|
tree
2021-07-16
lgo
u
bet
F
i
x
delete-change conflict d
e
tection (at file level)
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
P
r
event
NPE f
r
o
m
t
he title b
u
ilde
r
job if run
during
.
.
.
commit
|
commitdiff
|
tree
2021-07-16
l
goubet
Switch t
o
2021-06 tp and late
s
t E
G
it version
commit
|
commitdiff
|
tree
2021-02-23
lg
o
ub
e
t
Use Unix
l
in
e
delimit
e
r
s for sh
e
ll scripts
commit
|
commitdiff
|
tree
2021-02-23
lgoubet
Add scri
p
t to publish mil
e
stones for JIRO
commit
|
commitdiff
|
tree
2021-02-23
lgoubet
Add nig
h
t
l
y
publica
t
ion script for JIRO
commit
|
commitdiff
|
tree
2021-02-23
lgoubet
Open ran
g
es
t
o accept Guava 30
.
1
commit
|
commitdiff
|
tree
2021-02-08
lgoubet
Bump v
e
rsion
to 3
.
3
.
14
commit
|
commitdiff
|
tree
2021-02-08
lg
o
ube
t
Do not close the reposito
r
y when c
r
eating the EMF merge
.
.
.
commit
|
commitdiff
|
tree
2021-01-05
lgoubet
Po
t
ential NPE
commit
|
commitdiff
|
tree
2020-11-24
lgoubet
Make
sur
e
f
o
lders are
c
reated
w
hen extracting
input
.
.
.
commit
|
commitdiff
|
tree
2020-11-20
lgo
u
bet
B
u
mp ver
s
ions to 3
.
3
.
13
commit
|
commitdiff
|
tree
2020-11-19
lgo
u
bet
Do
not
c
lo
s
e the rep
o
sitory,
getRe
p
ositoryCache()
.
c
l
e
a
r
.
.
.
commit
|
commitdiff
|
tree
2020-10-21
lgoubet
A
l
low loading of
m
o
d
els using ID
attributes for compari
s
on
commit
|
commitdiff
|
tree
2020-10-21
lgou
b
et
Compatibility recent m
o
ckito
commit
|
commitdiff
|
tree
2020-10-04
lgoubet
O
nl
y
consider fi
l
e
s
we'
v
e extracted
as pot
e
ntial test
.
.
.
commit
|
commitdiff
|
tree
2020-08-31
lgoube
t
Del
e
te sub-pr
o
j
e
cts first w
h
en
c
leaning up
test
wo
r
kspace
commit
|
commitdiff
|
tree
2020-07-22
l
go
u
bet
Bum
p
Ve
r
s
ions to
3
.
3
.
12
commit
|
commitdiff
|
tree
2020-07-22
lgoub
e
t
F
i
x n
a
m
e
o
f 2
0
19-12 target
p
la
t
form
commit
|
commitdiff
|
tree
2020-05-26
lgoubet
Bump v
e
rsion
s
to
3
.
3
.
11
commit
|
commitdiff
|
tree
2020-01-14
lgo
u
bet
Bump update s
i
tes to 3
.
3
.
10
commit
|
commitdiff
|
tree
2020-01-14
lgoubet
B
u
m
p
EMF Compa
r
e to 3
.
3
.
10 and
a
d
d
2
0
19-12 targ
e
t pla
t
form
commit
|
commitdiff
|
tree
2020-01-06
l
goubet
P
r
event NPE from the closing of
a
C
omparison Dialog
commit
|
commitdiff
|
tree
2020-01-06
lgo
u
bet
C
ompatibility with
JGit 5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
P
otential N
P
E when switching files in
t
he compare dialog
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
R
e
-
enabl
e
signing and tycho-p2
-
plugin,
switch websi
t
e
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Build
test
i
ng - disable t
y
ch
o
-p2-p
l
ugi
n
commit
|
commitdiff
|
tree
2019-09-25
l
g
o
u
be
t
Build tes
t
ing - disable eclipse jarsigner
commit
|
commitdiff
|
tree
2019-09-24
lgoub
e
t
EMF C
o
mpare
d
o
cumentatio
n
j
a
r i
s
unsign
e
d
commit
|
commitdiff
|
tree
2019-09-19
lgoube
t
Re
p
l
a
ce G
u
ava with Jav
a
8
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Po
t
ential
r
a
ce
c
onditi
o
n when
l
oadi
n
g EPackag
e
s for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lg
o
ubet
Potential NP
E
with som
e
implementations of the pr
o
pe
r
ty
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Some
i
mp
l
ementatio
n
s
of R
e
source
.
Diagn
o
s
t
ic m
a
y
r
eturn
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
EMF Compare do
e
s not
s
upport re
l
ative xsi
:
schemaLocat
i
on
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
API compatibility
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Remove
p
a
r
t
o
f guava use
s
commit
|
commitdiff
|
tree
2019-09-18
lg
o
ubet
Bum
p
to 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lgou
b
et
Open the compare navi
g
atable as internal API
commit
|
commitdiff
|
tree
2019-09-18
l
g
oubet
Regis
t
er the
navig
a
table so that the
toolbar actions
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
l
g
o
u
bet
The nav
i
gatabl
e
's cache ne
e
ds to be cleared w
h
e
n
we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
The MatchEngineFactory doesn't
m
ake use of its
s
e
t
t
e
rs
commit
|
commitdiff
|
tree
2019-09-16
l
goubet
Happy ch
e
ckst
y
le
commit
|
commitdiff
|
tree
2019-09-11
lgoubet
Update
s
e
t
up
f
i
le
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Target platform based on 2019
-
06
commit
|
commitdiff
|
tree
2019-09-10
lg
o
ubet
Behavior change in 2019-
0
6
- Excepti
o
ns are now i
n
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgou
b
e
t
Remove th
e
32 bit pla
t
forms for our
target
configurations
commit
|
commitdiff
|
tree
2019-09-06
l
g
oub
e
t
Inde
x
issue when merging n
o
n-unique
a
ttribu
t
es' elemen
t
s
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
D
i
ffs depend
i
n
g on
ps
e
u
do-confli
c
ts do not reje
c
t
the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
MOVE differen
c
es also ne
e
d t
o
take into account the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Inaccurate confli
c
t d
e
tect
i
o
n
fo
r
move
s
in non-containment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Move
s
with non-unique
values
and addition/deletions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Only MOVE di
f
f
s ne
e
d to
b
e ignored whe
n
c
om
p
uting t
h
e LCS
commit
|
commitdiff
|
tree
2019-09-04
lgo
u
bet
Confli
c
t
det
e
ction on index cha
n
ges must
t
ak
e
F
eatureFilter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
l
goubet
M
ake sure the
UI w
o
n't try to compute the L
C
S f
o
r huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
The "accept/reject" all non-c
o
nflicting action shou
l
dn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
Fi
x
diff, conflict detecti
o
n and merging of no
n
-uni
q
ue
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgo
u
b
e
t
Pote
n
tial out o
f
bounds exception
commit
|
commitdiff
|
tree
2019-08-27
l
g
oubet
Compatibility with jgit 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
P
erformance - use
Diff
C
rossRefe
r
encer when pos
s
ib
l
e
commit
|
commitdiff
|
tree
2019-08-22
lgou
b
e
t
regression - right-click actio
n
s on single diff s
e
lect
i
o
n
s
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoub
e
t
Open SMV A
P
I to a
l
l
ow im
p
lem
e
nters t
o
access
t
h
e
r
aw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Prev
e
nts
e
xception
s
f
r
om be
i
ng
t
hrown from the v
i
ewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
P
e
rformance - use str
e
ams instead of gua
v
a iterations
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
Per
f
ormance
- remov
e
useless g
u
ava t
r
ansformati
o
n
commit
|
commitdiff
|
tree
2019-07-17
C
hris
t
ian W
.
D
a
mus
[
5
22080] [UM
L
] Add-add conflicts in st
e
reo
t
ype application
.
.
.
commit
|
commitdiff
|
tree
2019-07-17
lgo
u
bet
Fix det
e
c
t
ion of pseud
o
co
n
flict
s
on
s
i
ng
l
e-valued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoube
t
Regr
e
ssio
n
o
n
th
e
gr
o
u
p/match ri
g
h
t
-c
l
ic
k
act
i
ons in SMW
commit
|
commitdiff
|
tree
2019-07-16
lgoub
e
t
Properly des
c
ribe what the conflict resolving actions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Martin Fleck
[506928] ComparisonScopeEditorInput does not res
p
e
c
t
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
A
dd StructureMergeViewer customi
z
ation opti
o
ns
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Shortcu
t
t
h
e UMLPostProces
s
or's
subset implications
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Ax
e
l Richa
r
d
Activation of all
Git tes
t
s
commit
|
commitdiff
|
tree
2019-07-16
lgo
u
b
e
t
Pre
v
e
nt NPE from overriden Resource implem
e
ntations
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Ignore
"
originalTargetObje
c
ts" from the EMF Compare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
l
g
o
u
bet
Bump versions to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgoubet
A
dapt tes
t
s to
EGit c
h
a
nge o
f
b
e
hav
i
or
commit
|
commitdiff
|
tree
2019-05-29
lgou
b
et
Enable
u
sers to merge al
l
conflicts a
t
o
nce th
r
oug
h
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lg
o
ube
t
Merging sin
g
le-valued cont
a
i
n
m
e
nt
c
ha
n
ges ca
n
lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgo
u
bet
Typ
o
s
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Prev
e
nt LCS c
o
m
pu
t
ati
o
n when
w
e do not need ordering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgoubet
P
revent duplicate insertion points to be show
n
i
n tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgoubet
Prevent CMV disposal
when user selects multi
p
le element
s
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgou
b
et
Only a
d
d n
e
w adapters when
n
e
e
d
ed
commit
|
commitdiff
|
tree
2019-04-14
l
gou
b
et
It
e
rate ov
e
r the differences instead of the match
e
s
commit
|
commitdiff
|
tree
2019-04-09
l
goubet
Pre
v
e
n
t OutOfMe
m
oryErrors from the UI when switching CMV
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
Perfo
r
man
c
e - Com
p
uting requirements times
commit
|
commitdiff
|
tree
2019-04-08
l
g
oub
e
t
The UML tests shoul
d
n
't us
e
a cac
h
e
d instance
of
E
MFCom
p
are
commit
|
commitdiff
|
tree
2019-04-03
lgou
b
et
Restor
e
possi
b
ility to remove merge
r
s from the reg
i
stry
commit
|
commitdiff
|
tree
2019-03-22
lgoubet
Make su
r
e
w
e hook the UI wh
e
n users provid
e
a precom
p
u
t
ed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
l
g
oubet
Bump EMF
Compare to 3
.
3
.
7
i
n preparation f
o
r 2019-06
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Disposing
o
f
t
h
e comparison shouldn
'
t be done
b
y
th
e
SMV
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
B
ump
ver
s
ions
for
3
.
3
.
6 for 20
1
9-03
commit
|
commitdiff
|
tree
2019-02-26
lgoube
t
patch ModelGitMergeEditorInput for EGit 5
.
3
.
0 co
m
p
atibil
i
ty
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Suppress guava
nest
e
d
c
o
ncatenations
commit
|
commitdiff
|
tree
2019-02-11
lgoub
e
t
Remove accidental use of Guava
commit
|
commitdiff
|
tree
next