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 issu
e
w
hen merging
non-unique attribute
s
' e
l
ements
commit
|
commitdiff
|
tree
2019-09-06
l
g
oubet
Diffs
d
e
p
e
n
d
ing on pseudo-confl
i
cts do not reject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
M
O
VE differences also need to take
i
n
t
o account
t
h
e
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
I
naccurate conf
l
ict de
t
ectio
n
for moves in no
n
-c
o
ntainment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Mov
e
s with non-unique value
s
an
d
addition/deletions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
l
goubet
Only MOVE
diffs need to be ign
o
re
d
when co
m
puting the LCS
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Conflict
d
e
tection
o
n ind
e
x changes
m
ust take F
e
atureFi
l
t
e
r
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Make
sure the UI won't try t
o
compute the L
C
S f
o
r huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoube
t
The "
a
ccept
/
rej
e
ct" all n
o
n-confl
i
c
t
ing a
c
tion s
h
ouldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoub
e
t
Fi
x
diff, conflict detec
t
ion and mergi
n
g o
f
non-
u
nique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoubet
Potential ou
t
of bounds exception
commit
|
commitdiff
|
tree
2019-08-27
lgoubet
Compat
i
bili
t
y
with jgit 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
Performance
-
u
se DiffCrossRefer
e
n
c
er when possible
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
re
g
ression - ri
g
h
t-click action
s
on s
i
ngle diff se
l
ecti
o
ns
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Open SMV API to allow
i
mple
m
ente
r
s
t
o
access the
ra
w
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Prevents excepti
o
ns from be
i
ng thro
w
n from th
e
vi
e
wer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgo
u
bet
Performance - u
s
e
s
tre
a
ms
instead of guava
iteratio
n
s
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
Performan
c
e -
rem
o
v
e u
s
eless guav
a
t
r
ansformati
o
n
commit
|
commitdiff
|
tree
2019-07-17
l
go
u
bet
Fix detection
of pseud
o
c
onflicts on sin
g
le-valued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Regression on the
g
roup/match
right-click actions in SMW
commit
|
commitdiff
|
tree
2019-07-16
lgo
u
bet
P
roperly describe what t
h
e
c
onflict res
o
l
vin
g
actions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Add StructureMergeViewer customization options
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Sh
o
rtcut th
e
UMLPostProc
e
ssor's subset
i
mpli
c
ations
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ub
e
t
Prevent NPE from overriden
R
e
s
ource
i
mplem
e
ntations
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Ignore "origina
l
TargetObje
c
ts" from the EMF C
o
m
p
a
re
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
l
g
oubet
Bump versions to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgo
u
bet
Adapt tests to EGit change of
b
ehavior
commit
|
commitdiff
|
tree
2019-05-29
lgoubet
Enable users to
m
erge all
c
o
n
fl
i
c
ts at once throug
h
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
M
e
r
ging s
i
ngl
e
-value
d
con
t
ainment changes can l
e
a
d
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgo
u
bet
Typos
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
P
r
event LCS comput
a
tion whe
n
we do no
t
need order
i
ng
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgoubet
Prevent duplicate insertion
p
oi
n
ts to be
s
h
own in tre
e
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
l
goubet
Prevent CMV dispos
a
l when us
e
r se
l
e
cts mult
i
ple eleme
n
ts
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgoube
t
Only ad
d
new
a
dapters when needed
commit
|
commitdiff
|
tree
2019-04-14
lgoube
t
I
tera
t
e over the d
i
fferences i
n
s
t
ead of the matches
commit
|
commitdiff
|
tree
2019-04-09
lgoubet
Prev
e
nt OutOfMemo
r
yErrors
f
rom the UI when switch
i
n
g
CM
V
commit
|
commitdiff
|
tree
2019-04-08
l
go
u
bet
Perform
a
nce
-
Co
m
putin
g
r
eq
u
irements t
i
mes
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
The UML tests shouldn't u
s
e a c
a
c
hed
i
nstance of EMFCompare
commit
|
commitdiff
|
tree
2019-04-03
lgo
u
bet
Restore po
s
sibility t
o
r
e
move me
r
gers fr
o
m the registry
commit
|
commitdiff
|
tree
2019-03-22
lgo
u
bet
Make sure
w
e ho
o
k
t
he UI wh
e
n
u
s
ers pro
v
ide a
precompu
t
ed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Bump EMF
Com
p
are to 3
.
3
.
7 in pr
e
paratio
n
for 2019-06
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Disposin
g
of the co
m
pa
r
is
o
n
s
hou
l
dn'
t
be don
e
by the SMV
commit
|
commitdiff
|
tree
2019-03-04
lgoubet
Avoid
C
las
s
CastE
x
ception w
h
en merg
i
ng featu
r
e map changes
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Bump
versio
n
s for
3
.
3
.
6
f
or 2019-03
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
p
a
tch
ModelGitMerge
E
ditorInput for E
G
it 5
.
3
.
0 compatibility
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Suppress guava ne
s
ted concatenations
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Remov
e
a
c
cidental use of Guava
commit
|
commitdiff
|
tree
2019-02-11
lgoub
e
t
SWTEx
c
eption when
s
witc
h
ing comparisons in
a
compare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Allow clien
t
s to p
r
ov
i
de
p
re-computed co
m
parisons to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
lgoubet
Ignore f
a
il
i
ng git tests f
o
r
now
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Bump v
e
rs
i
ons t
o
3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Use a released versio
n
o
f
Sirius
commit
|
commitdiff
|
tree
2018-11-30
lgoubet
[541730] Revert
s
d59
c
924 due to an U
I
freeze
commit
|
commitdiff
|
tree
2018-06-22
lgoube
t
bu
m
p feat
u
r
e
versions
commit
|
commitdiff
|
tree
2018-06-22
lg
o
ubet
bump versions
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
EMF
C
ompar
e
i
s no longer compatible with
e
git <
4
.
2
commit
|
commitdiff
|
tree
2018-06-05
lgoubet
Introduce
t
est for
merges with multiple
ancestors
commit
|
commitdiff
|
tree
2018-03-13
lgo
u
b
e
t
Re
m
ovi
n
g
the
s
ubversi
v
e integratio
n
plugins
commit
|
commitdiff
|
tree
2018-01-30
lgoubet
B
u
mp plugin and
f
eature v
e
r
s
ions for Photon
commit
|
commitdiff
|
tree
2018-01-24
lgoubet
R
e
moving the Papyrus plugins and
f
e
a
tures fr
o
m the
.
.
.
commit
|
commitdiff
|
tree
2013-07-12
lgoube
t
[
4
10737
]
preserve ord
e
ring e
v
en for eq
u
ivalen
t
dif
f
erence
s
.
commit
|
commitdiff
|
tree
2013-01-18
lgoubet
[3
6
74
7
5
] Take
g
it specificities into account when
r
esol
v
ing
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
lgoub
e
t
Renam
i
n
g
ResourceTraversal into Storag
e
Tra
v
ersal t
o
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
Display a p
r
oper name for th
e
r
e
f
e
r
ences
when the
d
i
f
f
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
information
returned
i
f th
e
logical model r
e
sol
u
tion
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
lgoube
t
U
s
e t
h
e same ellisi
o
n
f
or Attrib
u
te and
reference labels
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
Properl
y
display difference t
h
at are not
dir
e
ctly ref
i
ned
commit
|
commitdiff
|
tree
2012-10-22
l
goube
t
P
re
v
ent merging towar
d
s the git index (or other remo
t
e
.
.
.
commit
|
commitdiff
|
tree
2012-10-22
lgou
b
et
L
o
w
e
r the n
u
mber of th
r
e
a
ds :
o
u
r
bott
l
enec
k
i
s
the
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lgo
u
bet
When
res
t
ructuri
n
g the match model
commit
|
commitdiff
|
tree
2012-10-19
l
g
oubet
Th
i
s has not
h
ing to do as pa
c
kage vis
i
b
le
commit
|
commitdiff
|
tree
2012-10-19
lgou
b
et
Make Reso
u
rceTraver
s
al, ResourceUtil and
S
torag
e
URIConver
t
er
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lg
o
ubet
Load
the right ver
s
ions
of the distant
f
iles
.
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
The UI shou
l
d us
e
post processor
s
commit
|
commitdiff
|
tree
2012-10-19
lgoub
e
t
a
v
oid dou
b
le schem
e
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
Always prevent
load
:
e
core t
e
nd
s
to load new resources
.
.
.
commit
|
commitdiff
|
tree
2012-10-15
lgoubet
Leave the possibility for sub-classe to not have a
.
.
.
commit
|
commitdiff
|
tree
2012-10-15
lgou
b
et
Supp
r
essing
unavoidable
w
a
r
ning
commit
|
commitdiff
|
tree
2012-10-15
lg
o
ubet
Commenting, and reduc
i
ng the nestin
g
coun
t
of getDELOrigin
V
a
.
.
.
commit
|
commitdiff
|
tree
2012-10-15
lg
o
ubet
Re
d
ucing n
e
sti
n
g
commit
|
commitdiff
|
tree
2012-10-15
lg
o
ubet
Mi
s
sing tags
commit
|
commitdiff
|
tree
2012-10-15
lg
o
ubet
C
o
m
m
enting
commit
|
commitdiff
|
tree
2012-10-15
lgoubet
Unused field
commit
|
commitdiff
|
tree
2012-10-05
lgoubet
The reso
l
ving call here is quite costly
.
Try and only
.
.
.
commit
|
commitdiff
|
tree
2012-10-05
l
g
o
ub
e
t
Per
f
- Avoid
d
e
e
p n
e
st
i
ng
of the concatenate
d
operators
commit
|
commitdiff
|
tree
2012-10-05
lgoubet
Merging Cedric's chang
e
s
commit
|
commitdiff
|
tree
2012-10-05
l
g
oub
e
t
Typo
commit
|
commitdiff
|
tree
2012-10-03
lgou
b
et
"private" is
"
final" b
y
def
i
n
it
i
o
n
:
)
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
useless conditi
o
n
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
PMD failed
at par
s
ing this
.
commit
|
commitdiff
|
tree
2012-10-03
lg
o
ubet
Synchron
i
zation he
l
l
.
The smart scop
e
stil
l
presented
.
.
.
commit
|
commitdiff
|
tree
2012-10-03
lgo
u
bet
Properly remov
e
r
e
ad-only
r
e
sources
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
U
se privi
l
eged act
i
on
when tryin
g
to set fields/methods
.
.
.
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
W
e
'll
neve
r
need to wr
i
te the
s
e fi
e
l
ds
.
Ma
k
e t
h
em final
.
.
.
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
logic
a
l error
commit
|
commitdiff
|
tree
2012-10-03
l
g
oubet
never closed stream
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
Adding uml2 su
p
port to t
h
e upda
t
e
site
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
Tryi
n
g t
o
act
i
vate UML2
t
ests
for th
e
build
commit
|
commitdiff
|
tree
2012-10-03
lg
o
ub
e
t
F
i
xing p
d
t warning
.
.
.
commit
|
commitdiff
|
tree
2012-10-02
lgoubet
use uml milestones
commit
|
commitdiff
|
tree
next