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] Load UML static profile using path map
2014-09-15
Art
h
u
r Daussy
[443330] Lo
a
d U
M
L sta
t
i
c
p
rofile
using path
m
ap
commit
|
commitdiff
|
tree
2014-09-15
Ar
t
hur Daussy
[44
3
330] Avoid getting
a "Profi
l
e ve
r
sion change" e
r
ror
.
commit
|
commitdiff
|
tree
2014-09-15
Arth
u
r D
a
uss
y
[443330] Improves URI handling
.
commit
|
commitdiff
|
tree
2014-07-03
Axel R
i
chard
F
eatureMaps:
Add
n
ew Diff:
F
e
a
tureMa
p
Change
commit
|
commitdiff
|
tree
2014-06-26
Arthur Daussy
Regenerat
e
s EM
F
Com
p
are stati
c
tes
t
profil
e
.
commit
|
commitdiff
|
tree
2014-06-26
Arthur Da
u
ssy
Ad
d
s UMLS
t
e
r
e
o
typedElementChange post proces
s
or
.
commit
|
commitdiff
|
tree
2014-06-20
Laure
n
t
Goub
e
t
avoid failures
comp
a
ring fi
l
es
a
t repo
s
itory root
commit
|
commitdiff
|
tree
2014-06-20
Axel
R
i
chard
EMF Co
m
pare doc: Add
tutor
i
a
l to index
commit
|
commitdiff
|
tree
2014-06-20
Art
h
ur Daussy
EM
F
C
ompare t
u
tor
i
al:
T
utorial part
1
commit
|
commitdiff
|
tree
2014-06-20
Arthur D
a
ussy
EMF
C
ompare t
u
t
o
rial: EXTlib
r
a
r
y
p
l
ugins
commit
|
commitdiff
|
tree
2014-06-03
Ax
e
l Richard
[435
2
51]
[435252] Update do
c
for Luna
commit
|
commitdiff
|
tree
2014-05-28
Axel Richard
[434828] Test Mer
g
e Conflict Diff With
Conflict
i
ng
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Arthur
D
aussy
[434828] Test Merge Co
n
flict Diff With
C
o
nflicting
.
.
.
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-28
Arthur Daussy
[434822] Conflict between m
o
ve and delete
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-27
A
xel Richard
[435743] Fix
Diagrams node are not displaye
d
an
y
m
o
re
.
.
.
commit
|
commitdiff
|
tree
2014-05-26
Axel
R
ichard
[435617] Fix Structure Mer
g
e Viewe
r
content with refined
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Arthur Dauss
y
[435365] CascadingFil
t
er s
h
ouldn
'
t fi
l
ter out
c
h
a
n
g
es
.
.
.
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-23
Axel Richar
d
[
43
1
88
2
] Fi
x
I
l
legal
S
t
a
t
eExcept
i
on in case of
Pseudo
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Axel Richard
[43
5
0
5
3] Add Pseudo
c
onfli
c
ts t
e
s
ts
.
commit
|
commitdiff
|
tree
2014-05-21
Axel Richard
[435376] Conf
l
i
cted subdiffs
s
hould
n
't be merged when
.
.
.
commit
|
commitdiff
|
tree
2014-05-20
Arth
u
r
D
aussy
[
4
34827] Wrong overlay icon a
f
ter merg
e
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-20
Axel Richard
[4348
6
6] Real Add Conflict Display
commit
|
commitdiff
|
tree
2014-05-07
A
xel Richard
[434200
]
Ac
c
ept/Reject differenc
e
fails in some c
a
ses
commit
|
commitdiff
|
tree
2014-05-06
Axel Richard
[4
3
4165] Mark con
s
e
quences a
s
merge
commit
|
commitdiff
|
tree
2014-05-06
Axel Ric
h
a
r
d
[
43164
3
] Fix Manage case of
no sel
e
cted
item
.
commit
|
commitdiff
|
tree
2014-05-05
Axel Richard
[4316
4
3] Fix Manage ca
s
e of no
select
e
d it
e
m
.
commit
|
commitdiff
|
tree
2014-05-05
A
xel Ric
h
ard
Add pseudo
c
o
n
flict di
f
fs to the required consequences
.
.
.
commit
|
commitdiff
|
tree
2014-04-28
Axel Richard
[431643] Man
a
ge case o
f
no selec
t
ed
ite
m
.
commit
|
commitdiff
|
tree
2014-04-28
A
x
el Richard
[431643] Ma
n
a
g
e cases of no differences
and no
visi
b
le
.
.
.
commit
|
commitdiff
|
tree
2014-04-17
Axel R
i
chard
Add equival
e
nces to t
h
e required con
s
equences shown
.
.
.
commit
|
commitdiff
|
tree
2014-04-10
A
r
thu
r
Daussy
Add
description for
"
UML refined element" filter
.
commit
|
commitdiff
|
tree
2014-04-10
A
r
thur Daussy
Add a desc
r
iption to "Diagr
a
m Refin
e
d elements"
.
commit
|
commitdiff
|
tree
2014-04-10
Arthur Daussy
Add desc
r
iption and
label t
o
"Diagram post
p
rocesso
r
"
commit
|
commitdiff
|
tree
2014-04-10
Arthur Daus
s
y
Engine
s
prefer
e
nc
e
page:
C
orrect message dial
o
g
commit
|
commitdiff
|
tree
2014-04-09
Ax
e
l Richard
nor
m
a
l
i
z
e EOLs in
the core (thir
d
pass)
commit
|
commitdiff
|
tree
2014-04-09
Arthur Dau
s
sy
[429636
]
Docume
n
tati
o
n update: Groups
commit
|
commitdiff
|
tree
2014-04-09
Arthur Daussy
[43037
2
]
Do
c
umentation update
.
commit
|
commitdiff
|
tree
2014-04-09
Axel Richard
[
432014] Tool
b
ar
a
p
pears twic
e
after
save
commit
|
commitdiff
|
tree
2014-04-08
A
r
thur Dauss
y
[430682] New
test: Test Mod
e
lResolverManager
commit
|
commitdiff
|
tree
2014-04-08
A
rt
h
u
r
Dau
s
sy
[430682] User Doc
:
Model
r
es
o
l
u
ti
o
n
commit
|
commitdiff
|
tree
2014-04-07
Arthu
r
Dauss
y
Impro
v
es preferenc
e
page UI
.
commit
|
commitdiff
|
tree
2014-04-07
Art
h
ur
D
a
u
ssy
[43068
2
] Improves Mod
e
lResolverManager
commit
|
commitdiff
|
tree
2014-04-03
Arthur Daussy
[
429441
]
U
s
er doc
u
pdate: Post p
r
ocessors c
o
n
figuration
commit
|
commitdiff
|
tree
2014-04-03
Arthur D
a
us
s
y
[431785] Correct
s
y
n
chro
n
iza
t
ion
mec
h
anism
commit
|
commitdiff
|
tree
2014-04-03
Arthur Daussy
[427126] User doc update: Engine con
f
iguration
commit
|
commitdiff
|
tree
2014-04-02
Arthur
D
au
s
sy
Improvements and corrections on Matc
h
EngineReg
i
stryWrapper
.
commit
|
commitdiff
|
tree
2014-04-02
Arthur Daussy
New t
e
s
ts: Test ItemRegistry
commit
|
commitdiff
|
tree
2014-04-02
Arthu
r
Dau
s
sy
[
4
29636]
A
dd Group Synchr
o
nization behavior mechanism
.
commit
|
commitdiff
|
tree
2014-04-01
Axel
Richar
d
[
431
6
93
]
The active group provider i
s
n
ot
s
elected
.
.
.
commit
|
commitdiff
|
tree
2014-03-31
A
r
thur
D
aus
s
y
[
429636
]
Create p
r
eference
p
age for groups
commit
|
commitdiff
|
tree
2014-03-31
Ar
t
hur Daussy
[
4
3068
2
] Prefer
e
nce page for M
o
d
el R
e
solving mechanism
commit
|
commitdiff
|
tree
2014-03-31
Arthur Daussy
[430682] Refactor
i
ng of I
M
ode
l
Resolver
commit
|
commitdiff
|
tree
2014-03-31
A
xel Richard
[431495] C
h
ange Group Provider must select the fir
s
t
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Axel Richard
[406516]
M
anag
e
P
arameterized Types in
C
ompa
r
ison
commit
|
commitdiff
|
tree
2014-03-28
Axel
R
ichar
d
Fix typo for Compare W
i
t
h
Each
O
the
r
in D
i
al
o
g
/Edito
r
commit
|
commitdiff
|
tree
2014-03-28
Axel Rich
a
rd
[429256] Inc
l
ude read only workspa
c
e
resources in scope
commit
|
commitdiff
|
tree
2014-03-28
Axel Richard
[418472]
Cannot mer
g
e
a move from n
e
stedClassifier
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Mikaël Ba
r
bero
Ad
d
content merg
e
viewer for de
f
ault EMFCompa
r
e c
o
ntent
.
.
.
commit
|
commitdiff
|
tree
2014-03-26
Axel
R
ichar
d
[428916] Rejecting addition with local hist
o
ry
d
oesn
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
Axe
l
Richard
[406439] EMF C
o
mpare does not support list wi
t
h
null
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
Axel
R
ichar
d
[4
1
7360]
NPE when comparing Resourc
e
s
not contained
.
.
.
commit
|
commitdiff
|
tree
2014-03-24
Arth
u
r
D
aussy
Typo error in de
v
elope
r
d
o
c
u
m
ent
a
tion
.
commit
|
commitdiff
|
tree
2014-03-24
A
x
el Richa
r
d
Increase
tar
g
etpla
t
form
D
SL files vers
i
on t
o
2
.
0
.
1
commit
|
commitdiff
|
tree
2014-03-24
Arthur Daussy
Remove usel
e
ss preference tab
.
commit
|
commitdiff
|
tree
2014-03-13
Axel Richar
d
[429123]
S
W
T
E
x
ception in Table
M
ergeViewer when changing
.
.
.
commit
|
commitdiff
|
tree
2014-03-13
Axel Richard
[429122] Wrong label use
d
in S
t
ructureMergeViewer
commit
|
commitdiff
|
tree
2014-03-13
Axel Richard
Fix broken links in developer guide
commit
|
commitdiff
|
tree
2014-03-10
Axel
Ric
h
ard
Fix wr
o
n
g ke
y
s when put WeightPro
v
ider in R
e
gis
t
ry
commit
|
commitdiff
|
tree
2014-03-10
Axel
R
ichard
Improves performances o
f
Weig
h
tProvider
R
e
gistry
commit
|
commitdiff
|
tree
2014-03-10
Axel Ri
c
hard
A
d
d
WeightProvider Reg
i
stry
commit
|
commitdiff
|
tree
2014-03-07
Axel Ri
c
hard
Upd
a
te RCP UI extensio
n
points referen
c
e
s
i
n
u
ser
.
.
.
commit
|
commitdiff
|
tree
2014-03-05
A
x
el Richard
Fix broke
n
li
n
ks in o
.
e
.
emf
.
compare
.
do
c
/F
A
Q
commit
|
commitdiff
|
tree
2014-03-05
A
xel Richard
Fix typo in MatchEng
i
neFac
t
oryRegi
s
try
W
rapp
e
r name
commit
|
commitdiff
|
tree
2014-02-26
Axe
l
Richa
r
d
Merg
e
remot
e
-tracking branch 'e
c
lipse/
m
aster' into
.
.
.
commit
|
commitdiff
|
tree
2014-02-26
Axel Richard
Add LogicalModelTe
s
t
to the Suite
commit
|
commitdiff
|
tree
2014-02-25
A
xel Richard
Improves
upd
a
t
e
C
hangedDependencies() in
Project
M
odelResolver
commit
|
commitdiff
|
tree
2014-02-19
Axel Richard
Change s
e
cond
s
to m
i
llise
c
onds for system
time measur
e
s
commit
|
commitdiff
|
tree
2014-02-18
Axel Ri
c
hard
Add h
e
ad
l
i
n
e in csv f
i
le if
d
o
e
sn't exi
s
ts
commit
|
commitdiff
|
tree
2014-02-18
Axe
l
Richard
D
e
le
t
e c
s
v files from r
e
po
commit
|
commitdiff
|
tree
2014-02-18
Axel Richard
Remove Logi
c
alMode
l
tests
f
rom s
u
ite
commit
|
commitdiff
|
tree
2014-02-17
Axel Richard
[
4
18163
]
Manage
d
isp
l
ay and merg
e
of UML Ster
e
otype
.
.
.
commit
|
commitdiff
|
tree
2014-02-17
A
xel Richard
[418163]
U
se s
a
fe vers
i
on of eGet
a
nd eSet i
n
M
erger
s
commit
|
commitdiff
|
tree
2014-02-14
Ax
e
l Richard
Updat
e
pom
.
x
ml (up
X
mx to
2
0
48m)
commit
|
commitdiff
|
tree
2014-02-14
Axel Richard
Move mer
g
e
viewer related AP
I
from provision
a
l
to public
.
commit
|
commitdiff
|
tree
2014-02-14
Ax
e
l Ric
h
ard
Move Con
t
entMergeViewer
accesso
r
related API from provisio
n
a
.
.
.
commit
|
commitdiff
|
tree
2014-02-14
Axel Ri
c
hard
update lu
n
a tp
commit
|
commitdiff
|
tree
2014-02-14
Axel
Richa
r
d
update defa
u
lt steps
n
um
b
er from 5 to 3
commit
|
commitdiff
|
tree
2014-02-13
Axel
R
i
chard
Update Logic
a
l mo
d
el t
e
s
t
,
update measures computing
commit
|
commitdiff
|
tree
2014-02-13
Axel Rich
a
rd
Reinit c
s
v files, upd
a
te
tp
commit
|
commitdiff
|
tree
2014-02-13
Axel Richard
Remo
v
e lar
g
e model
cases fr
o
m
tests
commit
|
commitdiff
|
tree
2014-02-12
Axel
R
ichard
A
dd new
t
e
s
ts
commit
|
commitdiff
|
tree
2014-02-10
Ax
e
l
Richard
Add performance test
s
plugins
commit
|
commitdiff
|
tree
2014-02-06
Axel Richard
M
o
ve
f
ilte
r
s & grou
p
s
r
ela
t
ed API from provisio
n
al
.
.
.
commit
|
commitdiff
|
tree
2014-02-01
Axel Richard
Update
t
a
r
get platform for Lun
a
M5
commit
|
commitdiff
|
tree
2014-01-28
Axel Richa
r
d
[426726] A "toString()"
is
r
eturned f
o
r the label of
.
.
.
commit
|
commitdiff
|
tree
2014-01-28
Axel Richa
r
d
Improve
perf
o
rmance of ProjectModelResolver
commit
|
commitdiff
|
tree
2013-11-19
A
xel
Richard
Fix condition bug
i
n
ProximityEObjectMatcher#createMat
c
hes
commit
|
commitdiff
|
tree
2013-11-12
A
x
el Richard
[421083]
F
i
x
Dif
f
erence
G
roup pr
o
vider
s
are shared
.
.
.
commit
|
commitdiff
|
tree
2013-10-30
Axel Richar
d
[4164
1
3] Fix D
i
ff
e
r
e
n
ce
n
o
t selected
i
n
content merge
.
.
.
commit
|
commitdiff
|
tree
2013-10-09
Axel Richard
[40900
4
]
-
Fix The 'merge
a
ll' a
c
tion
d
oesn't se
t
the
.
.
.
commit
|
commitdiff
|
tree
next