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 D
a
ussy
[44333
0
] Avoid gettin
g
a "Pr
o
file versio
n
chang
e
" error
.
commit
|
commitdiff
|
tree
2014-09-15
A
r
th
u
r
Dauss
y
[4
4
3330
]
Improves URI handling
.
commit
|
commitdiff
|
tree
2014-07-03
Axel Richard
F
e
atureMaps: Add ne
w
Diff
:
Featu
r
e
M
apChange
commit
|
commitdiff
|
tree
2014-06-26
Ar
t
hur Daussy
Regenera
t
es
EMF Compare static
t
est profile
.
commit
|
commitdiff
|
tree
2014-06-26
Arthur Daussy
Adds UM
L
Stere
o
typed
E
l
e
m
entCh
a
nge p
o
st process
o
r
.
commit
|
commitdiff
|
tree
2014-06-20
Laurent Goub
e
t
avoid fai
l
u
r
es comp
a
r
i
n
g
f
iles
a
t repository r
o
o
t
commit
|
commitdiff
|
tree
2014-06-20
A
x
el Richard
EM
F
Compare doc
:
Add tuto
r
ial to
inde
x
commit
|
commitdiff
|
tree
2014-06-20
Arth
u
r Daussy
EMF Co
m
pare tutorial: Tutorial part 1
commit
|
commitdiff
|
tree
2014-06-20
A
rt
h
ur Daussy
EMF Compar
e
t
utorial: EXTlibr
a
ry plu
g
ins
commit
|
commitdiff
|
tree
2014-06-03
Axel Richard
[
4
35251] [435
2
52] Upd
a
te doc for Luna
commit
|
commitdiff
|
tree
2014-05-28
A
xel
R
ichard
[434828] T
e
s
t
Merge Conflict Diff With Co
n
flicting
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
A
rthur Daussy
[
434828] Test Merge C
o
nflic
t
D
iff With Conflict
i
ng
.
.
.
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-28
Ar
t
hur Daussy
[434822]
Confli
c
t betwee
n
move and delete
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-27
Axel Richard
[4357
4
3
]
Fi
x
Diagrams no
d
e are not displa
y
ed anymore
.
.
.
commit
|
commitdiff
|
tree
2014-05-26
Axel Richard
[435617] Fix
S
t
ructure Mer
g
e View
e
r
conten
t
with r
e
fined
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
A
rthur Daussy
[
4
353
6
5
] C
a
s
c
adingFi
l
te
r
shouldn't filter
out changes
.
.
.
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-23
Axel Richard
[
4
31882]
Fix
Illega
l
Sta
t
eException i
n
ca
s
e of Pse
u
do
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Axel Richard
[4
3
5053
]
Add Pse
u
do conflicts tests
.
commit
|
commitdiff
|
tree
2014-05-21
Axel Ri
c
hard
[435376] Conflicted subd
i
ffs should
n
't be merged w
h
e
n
.
.
.
commit
|
commitdiff
|
tree
2014-05-20
Arthur Dau
s
sy
[4
3
4827] W
r
ong ov
e
rlay icon after merg
e
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-20
Axe
l
Richard
[434866
]
Re
a
l Add Conflic
t
Di
s
p
l
ay
commit
|
commitdiff
|
tree
2014-05-07
Axel Richa
r
d
[434200] Accept/Reject diff
e
r
e
nce
f
ail
s
in some
c
ase
s
commit
|
commitdiff
|
tree
2014-05-06
Axel Ric
h
ard
[434165] Mark cons
e
q
u
ences as
m
er
g
e
commit
|
commitdiff
|
tree
2014-05-06
Axe
l
R
ichar
d
[
4
31643
]
Fix Manage case of
no selected
i
t
em
.
commit
|
commitdiff
|
tree
2014-05-05
Axe
l
Richard
[43164
3
]
Fix Mana
g
e c
a
se of
no selected item
.
commit
|
commitdiff
|
tree
2014-05-05
Axel Ri
c
hard
Add pse
u
do conflict dif
f
s
to the re
q
uired conseq
u
ences
.
.
.
commit
|
commitdiff
|
tree
2014-04-28
Axe
l
Rich
a
rd
[
431643
]
Manage case o
f
no selec
t
ed item
.
commit
|
commitdiff
|
tree
2014-04-28
Axel
R
ic
h
ar
d
[4316
4
3]
M
anage cases of no differences
a
nd
no visible
.
.
.
commit
|
commitdiff
|
tree
2014-04-17
Ax
e
l Rich
a
rd
Add
equivalences to t
h
e required
consequ
e
nces
shown
.
.
.
commit
|
commitdiff
|
tree
2014-04-10
Arthur Da
u
ssy
Add desc
r
iption for "U
M
L
re
f
ined elem
e
nt" fi
l
ter
.
commit
|
commitdiff
|
tree
2014-04-10
Arthur Daussy
Add a description to "D
i
agram Refined el
e
men
t
s"
.
commit
|
commitdiff
|
tree
2014-04-10
A
rthur Dau
s
sy
Add description and
l
abel
t
o
"
Dia
g
ram post pro
c
essor"
commit
|
commitdiff
|
tree
2014-04-10
Ar
t
hur
D
a
u
s
sy
Engine
s
preferen
c
e p
a
ge: Correct message
dialog
commit
|
commitdiff
|
tree
2014-04-09
Ax
e
l Richard
n
o
rmal
i
ze EOLs
in the core (third pass)
commit
|
commitdiff
|
tree
2014-04-09
A
r
thur
D
aussy
[429
6
36] Docu
m
entation
upda
t
e: Groups
commit
|
commitdiff
|
tree
2014-04-09
Arthu
r
Daussy
[430372] Doc
u
me
n
ta
t
ion upda
t
e
.
commit
|
commitdiff
|
tree
2014-04-09
Axel Richard
[
432014] Toolbar appears twice after save
commit
|
commitdiff
|
tree
2014-04-08
Arthur
D
aussy
[430682] Ne
w
test: Test Mo
d
elResolverManag
e
r
commit
|
commitdiff
|
tree
2014-04-08
Ar
t
hur Daussy
[43
0
68
2
] User Doc: Model resolution
commit
|
commitdiff
|
tree
2014-04-07
Arthu
r
D
aussy
Improves preference
page
U
I
.
commit
|
commitdiff
|
tree
2014-04-07
Arthur Dauss
y
[430682
]
Im
p
roves ModelR
e
solv
e
r
M
anag
e
r
commit
|
commitdiff
|
tree
2014-04-03
Arth
u
r
Daussy
[
429
4
41] User doc upd
a
te: Post processo
r
s confi
g
ura
t
ion
commit
|
commitdiff
|
tree
2014-04-03
Arth
u
r D
a
ussy
[431785] Correct synchronization mechanis
m
commit
|
commitdiff
|
tree
2014-04-03
Arthu
r
Dauss
y
[42
7
126] User d
o
c update: Engine co
n
figu
r
ation
commit
|
commitdiff
|
tree
2014-04-02
Arthur
D
aussy
Improve
m
en
t
s and corrections
o
n
M
a
t
c
h
EngineReg
i
stryWr
a
pper
.
commit
|
commitdiff
|
tree
2014-04-02
Arthur Dau
s
sy
Ne
w
tests: Test It
e
mR
e
gistry
commit
|
commitdiff
|
tree
2014-04-02
Arthur Daus
s
y
[42
9
636] A
d
d
Group Synchronization behavior mecha
n
ism
.
commit
|
commitdiff
|
tree
2014-04-01
Axe
l
Ri
c
hard
[431693]
T
he active
group provider
i
s not selected
.
.
.
commit
|
commitdiff
|
tree
2014-03-31
Ar
t
hur Daussy
[4
2
96
3
6] Create
pre
f
erence page for g
r
oups
commit
|
commitdiff
|
tree
2014-03-31
Arth
u
r
Daussy
[
4
3
0
68
2
] Pref
e
renc
e
p
a
ge fo
r
Model Resolvin
g
m
echanism
commit
|
commitdiff
|
tree
2014-03-31
Arth
u
r Dauss
y
[430682] R
e
fact
o
ring of IModelResolver
commit
|
commitdiff
|
tree
2014-03-31
A
x
el
Richard
[431495] Change Group Prov
i
d
e
r
m
u
st
select the f
i
rs
t
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Axel Ric
h
ar
d
[40651
6
] Manage Parameterized
T
y
p
es
i
n C
o
m
p
arison
commit
|
commitdiff
|
tree
2014-03-28
Axel Richar
d
Fix
ty
p
o for Compare With Each Ot
h
e
r
in Dialog
/
Editor
commit
|
commitdiff
|
tree
2014-03-28
Axe
l
Ric
h
ard
[42
9
256
]
Include read only work
s
p
ace resources in sc
o
p
e
commit
|
commitdiff
|
tree
2014-03-28
Axel
Rich
a
rd
[4184
7
2
]
Cannot merge a move f
r
om nes
t
edClas
s
i
f
ier
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Mi
k
a
ël Barbero
A
d
d content
merg
e
v
iewer for default EMFCompare content
.
.
.
commit
|
commitdiff
|
tree
2014-03-26
Axe
l
Richar
d
[428916]
Rejecting additi
o
n
w
ith local histor
y
doesn
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
Axel R
i
cha
r
d
[406439] EMF
Compare does not supp
o
rt list wi
t
h
nul
l
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
Axel R
i
chard
[417360] NPE when co
m
paring
R
eso
u
rces not contained
.
.
.
commit
|
commitdiff
|
tree
2014-03-24
Arth
u
r
D
a
ussy
Typo error in d
e
velope
r
documentation
.
commit
|
commitdiff
|
tree
2014-03-24
Axel Richard
I
n
c
r
e
a
se ta
r
getplatform DSL
f
i
le
s
version to 2
.
0
.
1
commit
|
commitdiff
|
tree
2014-03-24
Arthur Daussy
Remove useless
pre
f
erence
tab
.
commit
|
commitdiff
|
tree
2014-03-13
Axel
R
i
c
h
ard
[4291
2
3] SWTExcept
i
o
n in TableM
e
rgeViewer when
c
hanging
.
.
.
commit
|
commitdiff
|
tree
2014-03-13
Axel Richa
r
d
[429122] Wro
n
g labe
l
use
d
in Struc
t
ure
M
erg
e
Viewer
commit
|
commitdiff
|
tree
2014-03-13
Axel
Ri
c
h
a
rd
F
i
x
broke
n
link
s
in develo
p
e
r guide
commit
|
commitdiff
|
tree
2014-03-10
Ax
e
l
R
ichar
d
Fix wro
n
g keys when put
W
eightProvider
i
n
Registr
y
commit
|
commitdiff
|
tree
2014-03-10
Axel Richard
Imp
r
oves pe
r
f
o
rmances of WeightProvider Registr
y
commit
|
commitdiff
|
tree
2014-03-10
Axe
l
Richard
A
d
d Weig
h
t
Provider Reg
i
s
t
ry
commit
|
commitdiff
|
tree
2014-03-07
Axel Richard
Update RC
P
UI extension
points references in user
.
.
.
commit
|
commitdiff
|
tree
2014-03-05
Axel
Richard
Fix broke
n
link
s
in o
.
e
.
em
f
.
compare
.
doc/FAQ
commit
|
commitdiff
|
tree
2014-03-05
A
xel
R
ic
h
ard
Fix typo in
M
atchEngineFactoryRegistry
W
rap
p
er name
commit
|
commitdiff
|
tree
2014-02-26
Axel Ri
c
hard
Merge remote-tracking branch '
e
clipse/mas
t
er' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2014-02-26
Ax
e
l Richard
Add Logical
M
odelTest to
t
he Suite
commit
|
commitdiff
|
tree
2014-02-25
Axel Ric
h
ard
Impr
o
ves
updateChangedD
e
pendencies() in Pr
o
jectM
o
delResolv
e
r
commit
|
commitdiff
|
tree
2014-02-19
Axel
Richa
r
d
Change
se
c
on
d
s
t
o mil
l
iseconds for
system ti
m
e measures
commit
|
commitdiff
|
tree
2014-02-18
Axel Ric
h
ard
Add headline in csv file
i
f d
o
esn't e
x
ists
commit
|
commitdiff
|
tree
2014-02-18
Axel Richar
d
Delete
c
sv
f
iles
f
rom repo
commit
|
commitdiff
|
tree
2014-02-18
Ax
e
l
R
icha
r
d
Remo
v
e Logical
M
odel tes
t
s fr
o
m suite
commit
|
commitdiff
|
tree
2014-02-17
Axel Richard
[41816
3
] Manage disp
l
a
y
and
m
erge of UML Stereotype
.
.
.
commit
|
commitdiff
|
tree
2014-02-17
Ax
e
l
Ric
h
ar
d
[418163] Use safe version
of eGet and eSet i
n
Mergers
commit
|
commitdiff
|
tree
2014-02-14
Axel Richard
Update pom
.
xml (up
X
m
x to 2048m)
commit
|
commitdiff
|
tree
2014-02-14
Axel Richard
Mo
v
e
m
erge vi
e
wer related A
P
I from provi
s
i
onal to pu
b
l
i
c
.
commit
|
commitdiff
|
tree
2014-02-14
Axel Ric
h
ar
d
Move ContentMergeViewer
accessor relate
d
API fro
m
provisiona
.
.
.
commit
|
commitdiff
|
tree
2014-02-14
A
x
el Richard
upd
a
te luna tp
commit
|
commitdiff
|
tree
2014-02-14
Axel Richard
upda
t
e
d
efault steps
number
f
rom 5 to 3
commit
|
commitdiff
|
tree
2014-02-13
Axel Richard
Update Log
i
cal model
t
est, updat
e
meas
u
res
c
o
m
puting
commit
|
commitdiff
|
tree
2014-02-13
Axel Ric
h
ard
Reinit csv files, update tp
commit
|
commitdiff
|
tree
2014-02-13
Axel Richa
r
d
R
e
m
o
v
e l
a
rg
e
mod
e
l c
a
ses from tests
commit
|
commitdiff
|
tree
2014-02-12
Axel R
i
char
d
Add new tests
commit
|
commitdiff
|
tree
2014-02-10
A
xel R
i
chard
Add performance
tes
t
s plugins
commit
|
commitdiff
|
tree
2014-02-06
Axel Richard
M
o
v
e
filters & groups rel
a
t
e
d API from provisi
o
nal
.
.
.
commit
|
commitdiff
|
tree
2014-02-01
Axel Richard
Up
d
ate target pl
a
tfor
m
for Luna M5
commit
|
commitdiff
|
tree
2014-01-28
A
xel R
i
chard
[426726]
A
"
toSt
r
i
n
g()"
i
s r
e
turned for
t
he la
b
el of
.
.
.
commit
|
commitdiff
|
tree
2014-01-28
A
xel Richard
Improve p
e
rformance of Proj
e
ctModelResolv
e
r
commit
|
commitdiff
|
tree
2013-11-19
Axel Richard
Fix
condition bug in Pro
x
imityEObject
M
atch
e
r#
c
re
a
teMatc
h
es
commit
|
commitdiff
|
tree
2013-11-12
Axel Ric
h
ard
[
42
1
083]
Fix Di
f
ference Group provid
e
rs are shared
.
.
.
commit
|
commitdiff
|
tree
2013-10-30
Axel Ri
c
h
ard
[416413] Fix Differen
c
e no
t
selec
t
ed in content merge
.
.
.
commit
|
commitdiff
|
tree
2013-10-09
Axel Richar
d
[409004] - Fix The 'me
r
ge
a
l
l
'
a
c
t
ion does
n
't set th
e
.
.
.
commit
|
commitdiff
|
tree
2013-10-03
Axel
Richa
r
d
[418600]
F
ix Un
d
o/Redo menu it
e
ms not availab
l
e
commit
|
commitdiff
|
tree
next