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 versions to 3.3.11
2020-05-26
l
gou
b
et
Bump versions to 3
.
3
.
11
commit
|
commitdiff
|
tree
2020-04-21
l
g
oubet
Git test f
r
a
m
e
work failing on
wi
n
dow
s
commit
|
commitdiff
|
tree
2020-01-14
lgoub
e
t
Bump
update sites 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
ta
r
get plat
f
orm
commit
|
commitdiff
|
tree
2020-01-06
lg
o
ubet
Prevent NPE from
the cl
o
sin
g
of a Com
p
a
riso
n
Dialog
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
Compa
t
ibi
l
ity w
i
th
JGit 5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
Potential NPE when
s
witchi
n
g f
i
les in
t
he compare
d
ialog
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
S
w
itch EMF
C
ompare
t
o
Guava 27
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
R
e-ena
b
le
s
igni
n
g and tycho
-
p2-plugin, s
w
itch webs
i
te
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Build testing - disa
b
le tycho-
p
2-plugin
commit
|
commitdiff
|
tree
2019-09-25
lgo
u
bet
Buil
d
t
e
sting -
d
i
s
abl
e
eclipse
jarsi
g
ner
commit
|
commitdiff
|
tree
2019-09-24
lgou
b
e
t
EMF Comp
a
r
e do
c
umen
t
ation jar is
u
n
s
igned
commit
|
commitdiff
|
tree
2019-09-19
lgou
b
et
Rep
l
ace Guava with Ja
v
a 8
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Potential race cond
i
t
ion when loading EPacka
g
es for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
l
g
oubet
P
o
t
ential NPE with some
im
p
lementations of t
h
e property
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Some im
p
le
m
en
t
ations
o
f Resource
.
Diagnos
t
ic may re
t
urn
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgou
b
et
EMF Compare does not
s
u
pport
rel
a
tive xsi:sch
e
maLocation
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
l
gou
b
et
API compatibili
t
y
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
R
emove part of guava uses
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Bump t
o
3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
l
goubet
Open th
e
co
m
pare
n
avi
g
a
t
a
bl
e
as
i
nt
e
r
n
al API
commit
|
commitdiff
|
tree
2019-09-18
lg
o
ube
t
R
e
g
i
s
t
er the navigatable
so
t
h
a
t the t
o
o
lb
a
r
actio
n
s
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lg
o
ube
t
The nav
i
g
a
table's
cache needs to
be cleared when we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lgoube
t
T
h
e
M
a
tchEn
g
ineF
a
c
tory
d
o
esn't make use of its setters
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
Happy checkstyle
commit
|
commitdiff
|
tree
2019-09-11
lgo
u
be
t
Update se
t
u
p file
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Targe
t
platform based on
2019-06
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Beha
v
ior change in 2019-06 -
E
xceptions are now i
n
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgou
b
et
Rem
o
v
e
the 32 bit platfo
r
m
s for ou
r
ta
r
get co
n
f
i
gurations
commit
|
commitdiff
|
tree
2019-09-06
lg
o
ubet
Index iss
u
e
w
hen m
e
rging non-unique
a
t
t
ributes' eleme
n
ts
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Diffs depending
o
n pseudo-conf
l
ic
t
s do not reject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lg
o
ubet
MOV
E
differences also need
t
o t
a
ke
i
nto account the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgo
u
bet
Inaccurate
c
onflict detecti
o
n f
o
r moves in non-containment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoube
t
Moves wit
h
non-unique valu
e
s and addit
i
on
/
dele
t
ions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
l
g
o
ubet
Only MOVE diffs
need to be ignored when
c
omputing
the LCS
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Conflict detection
on index changes
m
u
s
t ta
k
e FeatureFilter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
l
g
o
ubet
Make sure the
U
I won't
t
ry to compute
the LCS for hug
e
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgo
u
bet
The "accept
/
reject" all non-conflicti
n
g action shouldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
Fix diff
,
co
n
flict
detection a
n
d
m
erging o
f
non-uniq
u
e
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgou
b
et
Potential
o
ut of
b
ounds exceptio
n
commit
|
commitdiff
|
tree
2019-08-27
lgoubet
Compati
b
i
lity with
jgit 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
Perfo
r
man
c
e
-
use DiffCrossR
e
fere
n
cer w
h
en possib
l
e
commit
|
commitdiff
|
tree
2019-08-22
l
g
oub
e
t
regression - right-
c
lick actions on single diff selections
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgo
u
b
e
t
Open SMV API
to a
l
low imp
l
ementers to acc
e
ss
t
he raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Pr
e
vents exception
s
from be
i
n
g
thrown
f
rom the viewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
Pe
r
form
a
nce - use stre
a
ms instea
d
o
f
g
ua
v
a i
t
erat
i
ons
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
l
g
o
u
bet
P
e
r
for
m
anc
e
-
r
em
o
ve us
e
less guav
a
transf
o
rmation
commit
|
commitdiff
|
tree
2019-07-17
lgoubet
Fix
d
etec
t
ion of pseudo conflicts on single-valued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgou
b
et
Regression on t
h
e
g
ro
u
p/match right-click acti
o
ns in
SMW
commit
|
commitdiff
|
tree
2019-07-16
lgoub
e
t
Properly des
c
rib
e
what the con
f
lict
r
esolving actions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
g
oubet
Add
S
tructureMe
r
geViewer customiz
a
t
i
o
n options
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Shortcu
t
t
h
e
U
MLP
o
stProcessor's
s
ubset implications
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Preven
t
NPE from over
r
iden Resource
i
mplementations
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Ignore
"
originalTargetObj
e
cts"
f
r
om the EMF
Compare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgoubet
Bump versions to
3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgoube
t
Adapt
tests
t
o EGit
c
h
a
n
ge of behav
i
or
commit
|
commitdiff
|
tree
2019-05-29
lgoubet
En
a
ble
users to m
e
r
g
e
all conflict
s
a
t
once throu
g
h
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoube
t
Me
r
gi
n
g single
-
valued
c
ontainme
n
t changes can lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgou
b
et
T
y
p
o
s
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Prevent LC
S
computation when
w
e do
not nee
d
ordering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgou
b
et
P
r
ev
e
nt
d
uplicate insertion
poin
t
s to be shown in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgoubet
Preven
t
CMV dis
p
os
a
l when use
r
s
e
l
ects multiple elements
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
l
goubet
O
n
ly add ne
w
ada
p
ters w
h
en needed
commit
|
commitdiff
|
tree
2019-04-14
lgoubet
It
e
rate ov
e
r the differe
n
ces in
s
t
ead of th
e
matches
commit
|
commitdiff
|
tree
2019-04-09
lgoubet
Prevent OutOfMemoryErrors
fro
m
the UI when switchin
g
CMV
commit
|
commitdiff
|
tree
2019-04-08
l
g
oubet
Perform
a
nce
- Compu
t
ing requi
r
ements times
commit
|
commitdiff
|
tree
2019-04-08
lgoube
t
The U
M
L
t
es
t
s s
h
o
uldn't use a cached instance of EMFCompare
commit
|
commitdiff
|
tree
2019-04-03
l
g
o
ubet
Restore po
s
sib
i
lit
y
t
o remove mergers from the registry
commit
|
commitdiff
|
tree
2019-03-22
lgoub
e
t
Make sure we hoo
k
the UI when us
e
rs
p
ro
v
ide
a
preco
m
puted
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Bump EMF Co
m
pare to 3
.
3
.
7 in prepar
a
tion for 2019-06
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
D
i
sp
o
sing
o
f t
h
e comparison sh
o
uldn't be done by t
h
e
SMV
commit
|
commitdiff
|
tree
2019-03-04
lgoubet
Avoid ClassCastE
x
c
ep
t
i
on
when merging featur
e
map c
h
anges
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Bum
p
versio
n
s for 3
.
3
.
6 for 2019-03
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
patch
ModelGitMe
r
geEditorInput f
o
r E
G
it
5
.
3
.
0 compatibil
i
ty
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Suppress
g
u
a
va nested concatenatio
n
s
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Remov
e
acciden
t
al use of
G
u
ava
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
S
W
TExcepti
o
n
when sw
i
tchin
g
com
p
arisons in a c
o
m
p
are
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
l
goubet
Allow client
s
to prov
i
de pre-computed compa
r
isons
to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
l
goubet
Ignore
f
ai
l
ing
g
it tests for now
commit
|
commitdiff
|
tree
2018-12-03
lgoube
t
Bump ver
s
i
o
n
s to 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Use a released ve
r
sion of Sirius
commit
|
commitdiff
|
tree
2018-11-30
lgoub
e
t
[54
1
7
3
0]
Rever
t
s d59c924 due to an UI freeze
commit
|
commitdiff
|
tree
2018-06-22
lgoub
e
t
bump feature
ve
r
sions
commit
|
commitdiff
|
tree
2018-06-22
lgou
b
et
b
u
m
p versio
n
s
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
EMF Compar
e
is no longe
r
c
o
m
pati
b
le with egit
< 4
.
2
commit
|
commitdiff
|
tree
2018-06-05
l
g
oub
e
t
Intr
o
duce t
e
st for merges
w
i
th multipl
e
ance
s
tors
commit
|
commitdiff
|
tree
2018-03-13
lgoub
e
t
Removing the subve
r
s
ive integ
r
a
t
i
o
n
plugins
commit
|
commitdiff
|
tree
2018-01-30
lgoubet
Bump
plug
i
n and
f
eatu
r
e versions for P
h
oton
commit
|
commitdiff
|
tree
2018-01-24
lgoubet
Removi
n
g
the Pap
y
rus p
l
ugin
s
and f
e
atures from the
.
.
.
commit
|
commitdiff
|
tree
2013-07-12
lgoubet
[410
7
37] p
r
eserve ordering even for equiv
a
lent differe
n
ces
.
commit
|
commitdiff
|
tree
2013-01-18
l
g
oubet
[367475] Take git specificities in
t
o accoun
t
when
resolving
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
Re
n
aming Resou
r
c
eTrave
r
sal
i
nto Stora
g
eT
r
aversal to
commit
|
commitdiff
|
tree
2012-10-31
lgoube
t
Display
a prope
r
name for the referen
c
e
s
when
t
he diff
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
i
nformat
i
on returned
i
f the logi
c
al model resolution
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
lgoub
e
t
Use the same el
l
is
i
on
f
or
A
t
t
r
ibute and ref
e
rence labels
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
Prope
r
ly
displa
y
difference
that
are
not directly r
e
f
i
n
ed
commit
|
commitdiff
|
tree
2012-10-22
lgoub
e
t
Prevent merging towards the git index (or
o
ther re
m
ote
.
.
.
commit
|
commitdiff
|
tree
2012-10-22
l
g
ou
b
et
Lower the
n
u
m
be
r
of threads : our bottleneck is the
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lgo
u
bet
When r
e
structuring the mat
c
h model
commit
|
commitdiff
|
tree
2012-10-19
lg
o
ubet
This has nothing to do as
p
ackag
e
visibl
e
commit
|
commitdiff
|
tree
next