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
Index issue when merging non-unique attributes' elements
2019-09-06
lgoubet
Index issue when me
r
ging non-uniqu
e
attribut
e
s' elements
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
D
i
ffs depending on
p
seudo-confl
i
cts do not reject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgou
b
et
M
OVE differences also need to take into accou
n
t the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Inaccurate
c
o
nflict detectio
n
f
or move
s
in non-contai
n
ment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Moves with non-un
i
q
ue values and addition/deletions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
O
n
l
y MOVE diffs need
to be ignored when
c
omputi
n
g the LCS
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Conflict detection on index c
h
anges must take FeatureFilter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
l
g
oubet
M
a
ke sure
t
he UI w
o
n't try to c
o
mpute th
e
LC
S
for huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
l
goubet
T
he
"
a
ccept
/
reject
"
all non-co
n
flicting
a
c
tion shouldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
l
go
u
bet
Fi
x
diff, conflict d
e
tection and mergi
n
g of non-unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoubet
Potential out of bounds exception
commit
|
commitdiff
|
tree
2019-08-27
lgoubet
Compat
i
bility w
i
th jgit 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
l
g
oubet
Performance -
u
se Di
f
fC
r
ossR
e
fer
e
nce
r
whe
n
p
ossible
commit
|
commitdiff
|
tree
2019-08-22
lgoub
e
t
regress
i
on - right-
c
lick
a
ction
s
on sing
l
e diff se
l
ections
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
l
g
o
u
bet
Ope
n
SM
V
API to allow implemen
t
er
s
to acce
s
s the ra
w
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
l
g
oubet
Pr
e
vents exce
p
ti
o
n
s f
r
om bei
n
g throw
n
from the v
i
ewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lg
o
ubet
Performance - us
e
s
treams instead of guava ite
r
ati
o
ns
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
Perf
o
r
m
a
n
c
e -
r
emove use
l
es
s
guava trans
f
o
r
mation
commit
|
commitdiff
|
tree
2019-07-17
lg
o
ubet
Fi
x
detection
of p
s
eud
o
conflict
s
o
n single-va
l
ued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
g
oube
t
Regress
i
on on
the group
/
match r
i
ght-c
l
ick
a
ctions
in SMW
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Pro
p
er
l
y
d
esc
r
ibe what the conflict res
o
lving actions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgou
b
et
Add Stru
c
tureMergeViewer custom
i
z
atio
n
options
commit
|
commitdiff
|
tree
2019-07-16
lgoub
e
t
Shortcut the UMLP
o
stP
r
oces
s
o
r's sub
s
et implicat
i
ons
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Prevent NPE f
r
om overriden Res
o
urce i
m
p
l
e
mentations
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Ignore "orig
i
nalTargetObjects" from the E
M
F Compare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgoub
e
t
Bump ver
s
ions to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgoubet
Adapt
tests
to EGit change of
b
ehavior
commit
|
commitdiff
|
tree
2019-05-29
lg
o
ubet
E
na
b
le users to m
e
rge all co
n
fli
c
ts at once through
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
M
er
g
ing single
-
valued containm
e
nt changes can lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoube
t
T
ypos
commit
|
commitdiff
|
tree
2019-05-23
lgoub
e
t
P
r
ev
e
nt LCS comput
a
t
ion
w
hen we d
o
not need ordering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgoubet
Prevent du
p
licate
i
nsertion points to be shown in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgoubet
P
r
event
CMV
d
isposal when
user
s
elects mul
t
iple e
l
em
e
n
ts
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgo
u
bet
Only add new adapters when need
e
d
commit
|
commitdiff
|
tree
2019-04-14
lgou
b
et
Itera
t
e over the differe
n
ces instead
o
f
the m
a
tches
commit
|
commitdiff
|
tree
2019-04-09
lgoube
t
Prev
e
n
t
Out
O
fMemo
r
yErrors from the
UI when switching
C
MV
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
P
erformance - Computin
g
requirem
e
nts times
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
T
he UML tests s
h
ouldn't use a cach
e
d insta
n
ce of EMFCompa
r
e
commit
|
commitdiff
|
tree
2019-04-03
lgoub
e
t
Restore
possibility to remove merg
e
rs f
r
om the re
g
is
t
r
y
commit
|
commitdiff
|
tree
2019-03-22
l
g
ou
b
et
Make sure we
hook t
h
e U
I
when
u
sers provide a precomputed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Bump EMF Compare
to 3
.
3
.
7 in
preparation for 20
1
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
lg
o
ubet
Avoid Clas
s
C
astException when merg
i
ng feature map change
s
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Bump versions for 3
.
3
.
6 for 2019-03
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
patch ModelGitMergeEditorInput for EGit
5
.
3
.
0
compatibility
commit
|
commitdiff
|
tree
2019-02-26
lgo
u
bet
Suppress
g
uava nes
t
ed concatenations
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Rem
o
ve ac
c
idental use of Guava
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
SWTException when sw
i
t
chin
g
c
o
mpariso
n
s
in a c
o
mpare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Allow
c
lients t
o
p
r
ovide
p
re-compute
d
compar
i
son
s
to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
lgo
u
bet
Ignore failing git tests for now
commit
|
commitdiff
|
tree
2018-12-03
lgoub
e
t
Bump vers
i
ons to 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
U
se a released version
of Sirius
commit
|
commitdiff
|
tree
2018-11-30
lgoubet
[541730]
R
everts d59c92
4
due to an UI freeze
commit
|
commitdiff
|
tree
2018-06-22
lgoube
t
bump
f
e
a
ture versions
commit
|
commitdiff
|
tree
2018-06-22
l
g
o
u
b
et
bump
versions
commit
|
commitdiff
|
tree
2018-06-22
l
g
o
ubet
EMF Compare is no longer c
o
mpat
i
ble wit
h
egi
t
< 4
.
2
commit
|
commitdiff
|
tree
2018-06-05
lgoubet
Introduce test for m
e
rges with multiple an
c
est
o
rs
commit
|
commitdiff
|
tree
2018-03-13
lgoubet
R
e
moving th
e
subversive i
n
tegration plugi
n
s
commit
|
commitdiff
|
tree
2018-01-30
l
g
oubet
Bump plugin and feature versi
o
ns fo
r
Photo
n
commit
|
commitdiff
|
tree
2018-01-24
lgoubet
Re
m
ov
i
n
g
the Papyru
s
plug
i
ns and featur
e
s
from the
.
.
.
commit
|
commitdiff
|
tree
2013-07-12
lgoubet
[410737] p
r
eserve ordering eve
n
for eq
u
ivalen
t
differenc
e
s
.
commit
|
commitdiff
|
tree
2013-01-18
lgoub
e
t
[367475] Take git specificiti
e
s
i
nto acco
u
nt when resolving
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
Renaming R
e
sourceTr
a
v
e
rsal in
t
o Stor
a
geTra
v
er
s
a
l
to
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
D
i
s
p
l
a
y
a proper name
f
or th
e
references when the dif
f
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
information returned if the logical
m
odel r
e
s
olution
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
Use the
same ellision
for At
t
ribute a
n
d reference labels
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
Pr
o
perly displ
a
y dif
f
erenc
e
that are not directly refined
commit
|
commitdiff
|
tree
2012-10-22
lgou
b
et
Pr
e
vent merging towards t
h
e git in
d
ex (or othe
r
remote
.
.
.
commit
|
commitdiff
|
tree
2012-10-22
lg
o
ubet
Lower
the nu
m
b
er of threads : our
bottleneck
i
s the
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
When restructuring th
e
ma
t
ch
m
o
del
commit
|
commitdiff
|
tree
2012-10-19
lgoube
t
This h
a
s nothi
n
g
to do as package v
i
sible
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
Make
R
esource
T
raversal, Resou
r
c
eUt
i
l
and
StorageURIConverter
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lgou
b
et
L
oad the ri
g
ht versio
n
s o
f
the distant files
.
commit
|
commitdiff
|
tree
2012-10-19
l
g
oub
e
t
The UI shou
l
d use post processors
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
avoid double scheme
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lgo
u
bet
Alway
s
pr
e
ve
n
t load
:
eco
r
e te
n
ds to lo
a
d new resour
c
e
s
.
.
.
commit
|
commitdiff
|
tree
2012-10-15
l
goub
e
t
Leave t
h
e possibility
f
or s
u
b-classe
to
n
ot hav
e
a
.
.
.
commit
|
commitdiff
|
tree
2012-10-15
l
goube
t
Suppressing unavoi
d
able warning
commit
|
commitdiff
|
tree
2012-10-15
l
gou
b
et
Com
m
enting, and reducing
t
h
e
nesting count of
getDELO
r
i
g
i
nVa
.
.
.
commit
|
commitdiff
|
tree
2012-10-15
lgoubet
Reduc
i
ng nes
t
in
g
commit
|
commitdiff
|
tree
2012-10-15
lgoube
t
Mi
s
sing tags
commit
|
commitdiff
|
tree
2012-10-15
lgoub
e
t
Commenting
commit
|
commitdiff
|
tree
2012-10-15
l
g
oubet
Un
u
sed field
commit
|
commitdiff
|
tree
2012-10-05
lgoubet
Th
e
resolv
i
ng call her
e
is quite costly
.
Try and on
l
y
.
.
.
commit
|
commitdiff
|
tree
2012-10-05
lgoubet
P
e
rf -
Av
o
id
deep n
e
sting of the
c
oncaten
a
ted o
p
erators
commit
|
commitdiff
|
tree
2012-10-05
l
goubet
Me
r
g
i
n
g
Cedric's changes
commit
|
commitdiff
|
tree
2012-10-05
lgoubet
Typo
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
"priv
a
te" is "
f
inal" by definitio
n
:)
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
us
e
l
ess conditi
o
n
commit
|
commitdiff
|
tree
2012-10-03
l
goubet
PMD
f
a
i
led at p
a
rsing this
.
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
Synchronization hell
.
The sm
a
rt
scope
s
till pr
e
sente
d
.
.
.
commit
|
commitdiff
|
tree
2012-10-03
l
g
oubet
Proper
l
y remo
v
e read-o
n
ly resource
s
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
Use p
r
ivileg
e
d action when trying
t
o set f
i
el
d
s/methods
.
.
.
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
We'll n
e
ver need t
o
wr
i
te t
h
es
e
fields
.
Ma
k
e
them final
.
.
.
commit
|
commitdiff
|
tree
2012-10-03
l
g
o
ubet
logical
err
o
r
commit
|
commitdiff
|
tree
2012-10-03
l
g
oubet
ne
v
er clos
e
d stream
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
Adding uml2 su
p
port to
t
he upd
a
te site
commit
|
commitdiff
|
tree
2012-10-03
lgoube
t
T
r
y
i
ng to
a
ctivate UML2
t
es
t
s for the build
commit
|
commitdiff
|
tree
2012-10-03
lg
o
ubet
Fixing pdt warning
.
.
.
commit
|
commitdiff
|
tree
2012-10-02
lgoubet
us
e
u
m
l milestones
commit
|
commitdiff
|
tree
next