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
lg
o
ubet
Fix
r
e
l
e
ase script
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
fix release p
u
blication scri
p
t
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
Add script to publi
s
h releases for JI
R
O
commit
|
commitdiff
|
tree
2021-07-16
lg
o
u
bet
Fix delete-chan
g
e
c
onf
l
ict detectio
n
(at f
i
le level)
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
Prevent NPE from the titl
e
bui
l
der job
if run durin
g
.
.
.
commit
|
commitdiff
|
tree
2021-07-16
lgoub
e
t
Switch to 2021-0
6
t
p
and latest
E
Git vers
i
o
n
commit
|
commitdiff
|
tree
2021-02-23
lgoub
e
t
U
s
e
Unix line delim
i
ters fo
r
shell scripts
commit
|
commitdiff
|
tree
2021-02-23
lgoubet
Add s
c
ript to
publish milestones
f
or JIRO
commit
|
commitdiff
|
tree
2021-02-23
lgoubet
Add
n
i
ghtly
public
a
tion script for JIRO
commit
|
commitdiff
|
tree
2021-02-23
lgoubet
O
p
e
n
ran
g
es to acc
e
pt Guava 30
.
1
commit
|
commitdiff
|
tree
2021-02-08
lgoub
e
t
B
u
m
p vers
i
on
t
o 3
.
3
.
14
commit
|
commitdiff
|
tree
2021-02-08
lgoubet
D
o not
c
los
e
the repository
w
h
en creating
the EMF
me
r
ge
.
.
.
commit
|
commitdiff
|
tree
2021-01-05
lgoubet
Potential NPE
commit
|
commitdiff
|
tree
2020-11-24
lg
o
ubet
Make s
u
re folders
are c
r
eated when
e
x
tracting inpu
t
.
.
.
commit
|
commitdiff
|
tree
2020-11-20
lgoubet
Bump versions to 3
.
3
.
13
commit
|
commitdiff
|
tree
2020-11-19
l
g
oubet
Do not close the
repository
,
get
R
epositoryCa
c
he()
.
cle
a
r
.
.
.
commit
|
commitdiff
|
tree
2020-10-21
lgo
u
b
et
Allow loading of models
u
sing ID attributes for
comp
a
rison
commit
|
commitdiff
|
tree
2020-10-21
lgoubet
Compatibility recent mockito
commit
|
commitdiff
|
tree
2020-10-04
lgoub
e
t
Only cons
i
de
r
f
i
les we've extracted as potential
t
e
st
.
.
.
commit
|
commitdiff
|
tree
2020-08-31
lgoubet
Dele
t
e
s
ub-projects first when cle
a
ni
n
g up test
worksp
a
c
e
commit
|
commitdiff
|
tree
2020-07-22
lgoubet
Bump Versio
n
s to 3
.
3
.
12
commit
|
commitdiff
|
tree
2020-07-22
lgoubet
F
ix
name of 2019-12 target platfo
r
m
commit
|
commitdiff
|
tree
2020-06-26
lgou
b
e
t
Fix GitTestSupport
commit
|
commitdiff
|
tree
2020-05-26
l
goubet
Bump versions t
o
3
.
3
.
11
commit
|
commitdiff
|
tree
2020-04-21
lgoubet
G
i
t test
framew
o
rk failing on
windows
commit
|
commitdiff
|
tree
2020-01-14
lg
o
u
b
e
t
Bump update sites to 3
.
3
.
10
commit
|
commitdiff
|
tree
2020-01-14
lgoubet
Bump EMF Compare to 3
.
3
.
10 and a
d
d 2019-12 target plat
f
orm
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
Prev
e
nt NPE from the closin
g
of a C
o
mpari
s
o
n
Dial
o
g
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
Com
p
atibi
l
i
ty with JGit 5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lg
o
u
bet
Po
t
e
n
t
i
a
l NPE when sw
i
tch
i
n
g
f
i
les in the compar
e
dialog
commit
|
commitdiff
|
tree
2019-11-05
lgou
b
et
Switch EMF
C
ompa
r
e to
Guava 27
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Re-
e
n
able signing and tycho-p2-plugin, switch we
b
site
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
l
goubet
Bu
i
ld testing - dis
a
ble tyc
h
o-p2-pl
u
gin
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Bu
i
ld testing - disable eclipse ja
r
signe
r
commit
|
commitdiff
|
tree
2019-09-24
lgo
u
bet
EMF Compar
e
documentation jar i
s
unsigned
commit
|
commitdiff
|
tree
2019-09-19
lgo
u
bet
Replace Guava
with Java 8
commit
|
commitdiff
|
tree
2019-09-19
lg
o
ubet
Potential ra
c
e
c
ondition
when loading
EPackag
e
s for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
l
goubet
P
o
tentia
l
NPE with some implement
a
tions of the prop
e
r
t
y
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lg
o
ub
e
t
S
o
me imp
l
ementatio
n
s of Resource
.
Diagno
s
t
i
c may return
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
l
goubet
EMF Compare does not support rela
t
i
ve xsi:sche
m
aLoc
a
tion
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
l
go
u
bet
API compatib
i
lity
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Remove part of guava uses
commit
|
commitdiff
|
tree
2019-09-18
l
g
oubet
Bump to 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Open
t
he compa
r
e navigatable as internal API
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Regist
e
r the navigatable
so that the to
o
lba
r
ac
t
ions
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lgoubet
The navigatable's cache
ne
e
ds to be cl
e
ared when we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
l
g
oub
e
t
The Matc
h
EngineFacto
r
y d
o
esn
'
t
m
ake use of
its setters
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
H
appy ch
e
ckstyle
commit
|
commitdiff
|
tree
2019-09-11
lgoubet
Update setup file
commit
|
commitdiff
|
tree
2019-09-10
lgo
u
b
e
t
Target platform b
a
s
e
d on 2
0
19-06
commit
|
commitdiff
|
tree
2019-09-10
l
g
oubet
Beh
a
v
ior ch
a
n
g
e in 201
9
-06 - E
x
cepti
o
ns
a
re now i
n
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgoubet
Re
m
o
v
e
t
he 32 bit platforms f
o
r our tar
g
e
t config
u
ratio
n
s
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Index issue when merging
n
o
n-unique attribu
t
es
'
elements
commit
|
commitdiff
|
tree
2019-09-06
l
g
o
ubet
Diff
s
depe
n
ding on pseudo-conflicts do not reject t
h
e
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
l
g
o
ubet
M
OVE di
f
ferences also
need to t
a
ke into ac
c
ount the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Inaccur
a
t
e co
n
flict detect
i
on for moves
i
n non-c
o
ntainment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgo
u
bet
Moves wi
t
h
n
on-unique values
and addition/deletions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
On
l
y MOVE diffs need
to be ignored when c
o
m
puting t
h
e LCS
commit
|
commitdiff
|
tree
2019-09-04
l
goub
e
t
Conflict detection on index changes must take Featu
r
eF
i
lter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
l
goubet
Make su
r
e the U
I
won't t
r
y to c
o
mpute the LCS for huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
The "accept/reject
"
all non-conflicting
acti
o
n shoul
d
n
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgou
b
et
Fix
d
i
ff, conflict
de
t
ectio
n
a
n
d merging of non-uniqu
e
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lg
o
u
b
et
Potent
i
al out of bo
u
nds
e
xception
commit
|
commitdiff
|
tree
2019-08-27
lg
o
ubet
Com
p
a
t
ibili
t
y
with jgit 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
Perf
o
rmance - u
s
e DiffCrossRefe
r
e
n
cer when
possible
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
regression - right-c
l
ick action
s
o
n
single diff selections
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Open SMV AP
I
t
o allow
i
mplementers to a
c
cess the raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Prevents exceptions from being thrown from the viewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgou
b
et
Performance - use streams instead of guav
a
iterations
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
Performa
n
c
e - remo
v
e useless guava trans
f
ormation
commit
|
commitdiff
|
tree
2019-07-17
lgoubet
F
i
x dete
c
tion of pseudo conflic
t
s on si
n
gle-valued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
g
ou
b
et
Regression o
n
the gr
o
up/match right
-
click actions in SMW
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
Properly descri
b
e what the conflict resolving acti
o
ns
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Add
S
truc
t
ureMergeViewer
c
ustomizat
i
on optio
n
s
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Short
c
ut the UMLPostProcess
o
r's subse
t
implications
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Prevent NPE f
r
om overriden
Res
o
urce
implem
e
ntati
o
n
s
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Ignore
"
orig
i
n
alTargetObject
s
"
from the EMF Co
m
pare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgoubet
B
ump versions to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
l
goubet
Adap
t
te
s
ts to EGit change of behavior
commit
|
commitdiff
|
tree
2019-05-29
lgoube
t
Enable users to
merge all
confl
i
cts at onc
e
through
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Merg
i
ng single-valued c
o
ntain
m
ent
chan
g
es can lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgou
b
et
Typos
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Preven
t
LCS computati
o
n when we
do not need ord
e
ring
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
l
goubet
Prevent duplicate insertion
p
oints to
b
e show
n
in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lg
o
ubet
Prev
e
nt C
M
V disposal
whe
n
user selects mult
i
ple ele
m
ents
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgo
u
bet
Only add new
a
dap
t
ers when needed
commit
|
commitdiff
|
tree
2019-04-14
lgoubet
Iterate ove
r
the diff
e
rences
inste
a
d of the
matches
commit
|
commitdiff
|
tree
2019-04-09
lgoubet
Prevent OutOfM
e
moryErro
r
s fr
o
m the UI when swit
c
hing CMV
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
P
erf
o
rma
n
ce
- Comput
i
ng requirements
t
imes
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
T
h
e
UML tests s
h
ouldn't
u
se a ca
c
hed
i
nsta
n
ce
o
f EMF
C
o
m
p
a
re
commit
|
commitdiff
|
tree
2019-04-03
lgoube
t
R
estore
p
ossibility to remove mergers from the
regi
s
try
commit
|
commitdiff
|
tree
2019-03-22
lg
o
ubet
Mak
e
sure we hook the U
I
when
users
p
rovide
a
precomputed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Bum
p
EMF Compare to 3
.
3
.
7
in prep
a
ration f
o
r 2019-06
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Dispos
i
n
g of the c
o
m
p
arison shouldn
'
t b
e
done by the SMV
commit
|
commitdiff
|
tree
2019-03-04
lg
o
ubet
A
v
oid Cl
a
ssCastException when m
e
rging feat
u
re ma
p
changes
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Bum
p
versions for 3
.
3
.
6 for 2019-03
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
p
at
c
h
M
od
e
l
G
i
t
M
e
rgeE
d
itorInput for EGit 5
.
3
.
0
compatibility
commit
|
commitdiff
|
tree
2019-02-26
lgoub
e
t
Suppress guav
a
nested concate
n
ations
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Rem
o
ve accidental
u
se of Guava
commit
|
commitdiff
|
tree
2019-02-11
l
g
oubet
S
WTExce
p
tion w
h
en swit
c
hing
compariso
n
s in a
c
ompare
.
.
.
commit
|
commitdiff
|
tree
next