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
[443330] Avoid getting a "Profile version change" error.
2014-09-15
Arthur Da
u
ss
y
[4
4
3330
]
Avo
i
d getti
n
g
a
"
Profile
v
e
rsion chan
g
e" error
.
commit
|
commitdiff
|
tree
2014-09-15
Arthur Da
u
ssy
[443330]
I
mp
r
o
v
e
s UR
I
handling
.
commit
|
commitdiff
|
tree
2014-07-03
Axel Richa
r
d
Fea
t
u
reMaps:
A
dd new Dif
f
: Featu
r
eMapCha
n
ge
commit
|
commitdiff
|
tree
2014-06-26
Arthur Daussy
Regene
r
ates EMF Compa
r
e s
t
atic
test profile
.
commit
|
commitdiff
|
tree
2014-06-26
Arthur Daussy
Add
s
U
MLStereotyped
E
lementChange post pr
o
cesso
r
.
commit
|
commitdiff
|
tree
2014-06-20
Laurent Goube
t
a
v
oid failures
c
ompari
n
g files at
reposi
t
ory root
commit
|
commitdiff
|
tree
2014-06-20
Axe
l
Richard
EMF Compare
doc:
Add tu
t
o
rial to i
n
dex
commit
|
commitdiff
|
tree
2014-06-20
Arth
u
r Da
u
ssy
EMF Compare
tutorial: Tutor
i
a
l
part 1
commit
|
commitdiff
|
tree
2014-06-20
Arthur D
a
ussy
EMF Compare tutorial: EXTlibrary plugins
commit
|
commitdiff
|
tree
2014-06-03
Axel Richa
r
d
[435251] [43525
2
] U
p
d
a
te doc for Luna
commit
|
commitdiff
|
tree
2014-05-28
Axel Richard
[4348
2
8] Te
s
t Merge Conflict Dif
f
W
i
th C
o
nfli
c
ting
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Art
h
ur
D
aussy
[43482
8
] Test Merge Conflic
t
D
i
ff With Conflictin
g
.
.
.
Also-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-05-28
Ar
t
hur Daussy
[43482
2
] Conflict
b
etw
e
en move and delet
e
Also-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-05-27
Axel R
i
ch
a
rd
[435743
]
Fix Diagrams node are not display
e
d an
y
more
.
.
.
commit
|
commitdiff
|
tree
2014-05-26
Ax
e
l Ric
h
a
rd
[43561
7
] Fix Struc
t
ure Merge Vie
w
e
r cont
e
nt
w
ith r
e
f
i
n
ed
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Arthur Daussy
[4
3
5365
]
Cascad
i
ngFil
t
er shouldn't
f
ilter out ch
a
nges
.
.
.
Also-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-05-23
Axel
Richard
[431882]
Fix IllegalSt
a
teException in case of Pseudo
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Axel Richard
[435
0
53] Add
P
seudo confl
i
cts tests
.
commit
|
commitdiff
|
tree
2014-05-21
Axel Richa
r
d
[435376] Conflicted subdiffs shouldn't be m
e
rg
e
d when
.
.
.
commit
|
commitdiff
|
tree
2014-05-20
Arthur D
a
ussy
[
4
34
8
2
7] Wr
o
ng ov
e
rlay icon afte
r
merge
Also-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-05-20
Axel Richard
[4348
6
6
]
Real Add Con
f
lict Displ
a
y
commit
|
commitdiff
|
tree
2014-05-07
A
x
el Richard
[434200]
A
ccept/Reject difference fails
i
n some cases
commit
|
commitdiff
|
tree
2014-05-06
Axel R
i
char
d
[4341
6
5
]
Mark
c
o
n
se
q
uences as merg
e
commit
|
commitdiff
|
tree
2014-05-06
Axel Richard
[
4
316
4
3]
F
ix Man
a
ge case of no selec
t
ed item
.
commit
|
commitdiff
|
tree
2014-05-05
A
xel Richard
[43
1
643] Fix Manage case of no s
e
lec
t
ed item
.
commit
|
commitdiff
|
tree
2014-05-05
Axel
R
ichard
A
d
d pseudo
c
onf
l
ict diffs to the r
e
quired consequ
e
n
ces
.
.
.
commit
|
commitdiff
|
tree
2014-04-28
Axel R
i
char
d
[431643] Manage
case
of no selected item
.
commit
|
commitdiff
|
tree
2014-04-28
Ax
e
l Rich
a
r
d
[
43
1
643
]
Manage cases
o
f
no differe
n
c
e
s and no v
i
sible
.
.
.
commit
|
commitdiff
|
tree
2014-04-17
Axe
l
Richar
d
Add e
q
u
ivalenc
e
s t
o
the required co
n
sequences shown
.
.
.
commit
|
commitdiff
|
tree
2014-04-10
Arthur Daus
s
y
Add d
e
s
c
r
iption for "UML refined element" filter
.
commit
|
commitdiff
|
tree
2014-04-10
Arthur
D
a
u
ssy
Add a
d
escription
t
o "Diagram Re
f
ined element
s
"
.
commit
|
commitdiff
|
tree
2014-04-10
Arthu
r
Daussy
A
d
d description an
d
label
t
o "Di
a
gram post proces
s
o
r
"
commit
|
commitdiff
|
tree
2014-04-10
A
r
thur Daussy
En
g
ines prefe
r
enc
e
page: Corr
e
ct mes
s
a
ge d
i
al
o
g
commit
|
commitdiff
|
tree
2014-04-09
Ax
e
l Ri
c
hard
normalize EO
L
s
in the core (thir
d
pass)
commit
|
commitdiff
|
tree
2014-04-09
Arthur Daussy
[4296
3
6]
Do
c
u
m
entation update: G
r
oups
commit
|
commitdiff
|
tree
2014-04-09
Arthur Daussy
[430372]
D
ocu
m
entatio
n
up
d
ate
.
commit
|
commitdiff
|
tree
2014-04-09
A
xel Richa
r
d
[432014
]
Too
l
bar appears
t
wice afte
r
save
commit
|
commitdiff
|
tree
2014-04-08
Arthur
D
a
u
s
s
y
[430682] New
t
e
st: Tes
t
ModelResolverManage
r
commit
|
commitdiff
|
tree
2014-04-08
Arthur Daussy
[430682] User D
o
c
: Model r
e
solution
commit
|
commitdiff
|
tree
2014-04-07
Arthur Daussy
Improves preferenc
e
page UI
.
commit
|
commitdiff
|
tree
2014-04-07
Arth
u
r Daussy
[
4
3
0
682]
I
mproves Mo
d
elRes
o
lverManager
commit
|
commitdiff
|
tree
2014-04-03
A
r
thur Daus
s
y
[429441] User doc update: Post processors
configura
t
ion
commit
|
commitdiff
|
tree
2014-04-03
Arthur
D
aussy
[
4
3
1
7
8
5
] Co
r
r
e
c
t synchroniza
t
ion
mechanism
commit
|
commitdiff
|
tree
2014-04-03
Arthur Daussy
[427126] U
s
er doc update:
Engine con
f
iguration
commit
|
commitdiff
|
tree
2014-04-02
Arthu
r
Daussy
Improvemen
t
s
a
nd correcti
o
n
s on Match
E
ngineR
e
gistryWr
a
p
p
er
.
commit
|
commitdiff
|
tree
2014-04-02
A
rthur Daussy
New test
s
:
T
e
st
ItemRegis
t
r
y
commit
|
commitdiff
|
tree
2014-04-02
Art
h
ur Daussy
[
4
29636] Add Group Synchronizati
o
n be
h
avior mechanism
.
commit
|
commitdiff
|
tree
2014-04-01
A
x
el Richard
[431693] The active
g
roup prov
i
der is not selected
.
.
.
commit
|
commitdiff
|
tree
2014-03-31
Ar
t
h
u
r
Daussy
[4
2
9636] Create p
r
e
f
erence pa
g
e
for group
s
commit
|
commitdiff
|
tree
2014-03-31
Art
h
ur
D
aussy
[430682] Preference p
a
ge
f
or Mod
e
l
Resolving mechanism
commit
|
commitdiff
|
tree
2014-03-31
Ar
t
h
u
r Daussy
[43
0
682] R
e
factoring of IM
o
delReso
l
ver
commit
|
commitdiff
|
tree
2014-03-31
Ax
e
l Richard
[431495]
C
hange Group Provid
e
r must s
e
lect the fi
r
st
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Axel Ric
h
ard
[
4
065
1
6] Man
a
g
e
Parameteriz
e
d Types in Comparison
commit
|
commitdiff
|
tree
2014-03-28
A
xel
Richa
r
d
Fix typo for Compar
e
Wit
h
Each Oth
e
r
i
n D
i
alog/Edit
o
r
commit
|
commitdiff
|
tree
2014-03-28
Axel Rich
a
r
d
[42925
6
] Inclu
d
e read only
w
or
k
space resourc
e
s
in s
c
o
pe
commit
|
commitdiff
|
tree
2014-03-28
Axel Rich
a
rd
[41847
2
] Cannot merge a move from nestedCl
a
ssifier
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Mik
a
ël Bar
b
ero
Add content merge viewer
for
d
e
fault
EMFCompare co
n
tent
.
.
.
commit
|
commitdiff
|
tree
2014-03-26
Axel
R
ichard
[428916]
Rejecting addition with
local histor
y
doesn
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
Axe
l
Richard
[40
6
439] EMF Comp
a
re does no
t
supp
o
rt
list w
i
th
null
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
A
x
el Ric
h
ard
[417
3
60
]
NPE when compar
i
ng
R
esou
r
ces not contained
.
.
.
commit
|
commitdiff
|
tree
2014-03-24
A
r
t
hur Daussy
Ty
p
o
e
rro
r
in d
e
velo
p
e
r
doc
u
men
t
ation
.
commit
|
commitdiff
|
tree
2014-03-24
Axel Ri
c
ha
r
d
Increase t
a
rget
p
l
a
tform DSL files version to 2
.
0
.
1
commit
|
commitdiff
|
tree
2014-03-24
Ar
t
hur Dauss
y
Remove u
s
eless pref
e
rence tab
.
commit
|
commitdiff
|
tree
2014-03-13
Axel
Rich
a
rd
[429123] SWTExceptio
n
in
T
ableMergeViewe
r
when cha
n
ging
.
.
.
commit
|
commitdiff
|
tree
2014-03-13
Axel Richard
[429122] Wrong
l
abel used i
n
Struc
t
ur
e
Merge
V
iewer
commit
|
commitdiff
|
tree
2014-03-13
Axel
R
ichard
Fix broken link
s
i
n
developer guide
commit
|
commitdiff
|
tree
2014-03-10
A
xel Richard
Fix
wrong
k
eys when put WeightProvider in
Regi
s
try
commit
|
commitdiff
|
tree
2014-03-10
Axel
Richard
Im
p
ro
v
es
p
erfo
r
mances
o
f WeightProvider Regi
s
try
commit
|
commitdiff
|
tree
2014-03-10
Axel
Richard
Ad
d
Weig
h
tProvider
Regi
s
try
commit
|
commitdiff
|
tree
2014-03-07
Axel Ri
c
hard
Update R
C
P
U
I
ext
e
n
s
ion points refere
n
c
e
s
in user
.
.
.
commit
|
commitdiff
|
tree
2014-03-05
Axel Richard
Fix broken lin
k
s in o
.
e
.
emf
.
compa
r
e
.
doc/FA
Q
commit
|
commitdiff
|
tree
2014-03-05
Axel
R
ichard
Fix typo in MatchEngineFacto
r
y
RegistryWrapper
n
ame
commit
|
commitdiff
|
tree
2014-02-26
Ax
e
l
Ri
c
hard
Mer
g
e remote-tracki
n
g
branch
'eclips
e
/master' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2014-02-26
A
x
el Richard
Add
LogicalModelTest t
o
t
he Suite
commit
|
commitdiff
|
tree
2014-02-25
Axel Richard
Impr
o
ves updat
e
ChangedDependencies(
)
in
P
roj
e
ctModelResolver
commit
|
commitdiff
|
tree
2014-02-19
Axel Richar
d
Change seconds to millise
c
o
nds
f
or
s
y
stem
t
ime
mea
s
ures
commit
|
commitdiff
|
tree
2014-02-18
A
x
e
l
Richard
Add
h
eadline in csv file if does
n
't
e
x
i
st
s
commit
|
commitdiff
|
tree
2014-02-18
A
x
el Richard
De
l
ete csv files fro
m
r
e
p
o
commit
|
commitdiff
|
tree
2014-02-18
Axel Richard
R
e
m
ove Lo
g
i
cal
M
odel test
s
f
r
om suite
commit
|
commitdiff
|
tree
2014-02-17
A
xel Ric
h
ar
d
[418163] Manage
d
i
splay
and merge of UML St
e
r
e
o
t
y
pe
.
.
.
commit
|
commitdiff
|
tree
2014-02-17
Axel Richard
[418
1
63] Use
s
a
fe versi
o
n of
eGet
and eSet in
Mergers
commit
|
commitdiff
|
tree
2014-02-14
Axel
R
ichard
U
p
date
p
om
.
xml (up
Xmx to 2048m
)
commit
|
commitdiff
|
tree
2014-02-14
Axe
l
Richard
M
o
ve m
e
r
g
e v
i
ewer
re
l
ated API
f
rom provisio
n
al to public
.
commit
|
commitdiff
|
tree
2014-02-14
A
xel Richard
M
ove Conten
t
MergeViewer
accessor
r
elated API from provisiona
.
.
.
commit
|
commitdiff
|
tree
2014-02-14
A
x
el Rich
a
rd
u
p
date luna
tp
commit
|
commitdiff
|
tree
2014-02-14
Axel Ric
h
ard
update def
a
u
l
t
s
t
e
ps number from 5 t
o
3
commit
|
commitdiff
|
tree
2014-02-13
Axel Ri
c
h
a
rd
Update
L
ogical mo
d
el test, update measures
c
omputing
commit
|
commitdiff
|
tree
2014-02-13
Axel Richa
r
d
Re
i
nit csv files, upd
a
te
t
p
commit
|
commitdiff
|
tree
2014-02-13
A
xel
R
i
chard
Remove large
m
o
d
el cases from tests
commit
|
commitdiff
|
tree
2014-02-12
A
xel Rich
a
rd
Add
new tests
commit
|
commitdiff
|
tree
2014-02-10
Axel R
i
ch
a
rd
Add p
e
rformance tests plugins
commit
|
commitdiff
|
tree
2014-02-06
Ax
e
l
R
i
chard
Move
filters &
g
roups related
AP
I
from prov
i
sional
.
.
.
commit
|
commitdiff
|
tree
2014-02-01
Axel
R
ichard
U
pdate target platform for Lu
n
a
M5
commit
|
commitdiff
|
tree
2014-01-28
A
x
el Richard
[426726] A "toStrin
g
(
)
" is returned
for the label
o
f
.
.
.
commit
|
commitdiff
|
tree
2014-01-28
Axel
Richar
d
Impro
v
e performanc
e
o
f
Pro
j
ectModelResolver
commit
|
commitdiff
|
tree
2013-11-19
A
xe
l
Richard
Fix
c
ondition bug in ProximityEObjectMatcher#createMatches
commit
|
commitdiff
|
tree
2013-11-12
Axe
l
Ri
c
hard
[421083] Fix Difference Grou
p
p
r
o
vid
e
rs
are shared
.
.
.
commit
|
commitdiff
|
tree
2013-10-30
A
xel Richard
[
4
16
4
13]
F
i
x Di
f
ference n
o
t se
l
e
cted in content merge
.
.
.
commit
|
commitdiff
|
tree
2013-10-09
Axel
R
ichard
[40
9
004] - Fix
T
he '
m
erge all' act
i
on doesn't
s
et th
e
.
.
.
commit
|
commitdiff
|
tree
2013-10-03
Axel Rich
a
rd
[
418600
]
Fix
Undo/Redo menu items not
a
vailable
commit
|
commitdiff
|
tree
next