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
Arth
u
r
Da
u
s
sy
[443330] Load UML
static profi
l
e us
i
ng path map
commit
|
commitdiff
|
tree
2014-09-15
Arthur Daussy
[443330] Avoid
g
et
t
ing a "Pr
o
f
ile version c
h
ange" er
r
or
.
commit
|
commitdiff
|
tree
2014-09-15
Arthur Daussy
[443
3
30] Improves
U
RI h
a
ndling
.
commit
|
commitdiff
|
tree
2014-07-03
Axel Richard
Feat
u
reMaps:
Add new Di
f
f: FeatureM
a
pChange
commit
|
commitdiff
|
tree
2014-06-26
Arth
u
r Daussy
R
egenerates EMF Compare s
t
atic t
e
st profile
.
commit
|
commitdiff
|
tree
2014-06-26
Arthur
D
aus
s
y
Adds UMLS
t
ereotypedElementCh
a
nge post p
r
o
c
essor
.
commit
|
commitdiff
|
tree
2014-06-20
Laurent
Goubet
a
void fail
u
res
c
o
m
paring files
a
t re
p
o
s
i
t
ory
r
oot
commit
|
commitdiff
|
tree
2014-06-20
Axel Ric
h
a
rd
EMF Compare
d
o
c:
A
d
d tutori
a
l
t
o index
commit
|
commitdiff
|
tree
2014-06-20
Arthur Dau
s
sy
EMF
Compare tutor
i
a
l
:
Tutorial part 1
commit
|
commitdiff
|
tree
2014-06-20
Arthu
r
Daussy
EM
F
Compare tutorial:
EXTli
b
rary pl
u
gins
commit
|
commitdiff
|
tree
2014-06-03
Ax
e
l
Richard
[435
2
51] [435252] Updat
e
d
o
c for Luna
commit
|
commitdiff
|
tree
2014-05-28
A
x
e
l
Richa
r
d
[4
3
4828] Tes
t
Merge
Conflic
t
Diff
W
i
th Conf
l
icting
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Arth
u
r
Daussy
[
4
34
8
2
8] Test
Merge Con
f
lict Diff
With
Co
n
flicting
.
.
.
Also-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-05-28
Ar
t
hur
D
aussy
[
4
34822] C
o
nflict b
e
tween move and dele
t
e
Also-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-05-27
Axel Richar
d
[4357
4
3] Fix Diagrams node a
r
e not displa
y
ed anymore
.
.
.
commit
|
commitdiff
|
tree
2014-05-26
A
xel Rich
a
rd
[4
3
5617] Fix St
r
uc
t
u
r
e Merge Viewer
c
on
t
ent with refined
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Arthu
r
Daussy
[435365] Cascadi
n
gFilter sho
u
ldn't
filter out
c
h
anges
.
.
.
Also-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-05-23
Axel Rich
a
rd
[431882]
F
ix IllegalStateException in case of Pseudo
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Ax
e
l Rich
a
rd
[43
5
053
]
Add P
s
eudo confli
c
ts t
e
sts
.
commit
|
commitdiff
|
tree
2014-05-21
Axel Richard
[435
3
76] Conflicted subdiffs shoul
d
n't be merged w
h
e
n
.
.
.
commit
|
commitdiff
|
tree
2014-05-20
Arthur Daussy
[434827] Wron
g
ove
r
l
a
y icon af
t
e
r
merge
Also-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-05-20
Axel Ric
h
ard
[434866]
R
eal Add Con
f
l
ict Display
commit
|
commitdiff
|
tree
2014-05-07
Axe
l
Richard
[434200] A
c
cept/Re
j
ect diff
e
r
e
nce fails
i
n
s
om
e
cases
commit
|
commitdiff
|
tree
2014-05-06
Ax
e
l
R
i
chard
[434165
]
Mark
c
onseque
n
ces
as me
r
ge
commit
|
commitdiff
|
tree
2014-05-06
Axel R
i
chard
[431643] Fix
M
anage case
of no sele
c
ted item
.
commit
|
commitdiff
|
tree
2014-05-05
Axe
l
Richard
[431643] Fix Manage c
a
se of no s
e
l
e
c
t
ed item
.
commit
|
commitdiff
|
tree
2014-05-05
Axel Richard
Add pseudo co
n
f
lict diffs to t
h
e required c
o
nseque
n
ces
.
.
.
commit
|
commitdiff
|
tree
2014-04-28
Axel Richard
[
4
31
6
43] Manage cas
e
of n
o
selected item
.
commit
|
commitdiff
|
tree
2014-04-28
Axel Richard
[
4
3
1
643]
M
anage cases of no diffe
r
ences and no
visib
l
e
.
.
.
commit
|
commitdiff
|
tree
2014-04-17
Axel Richard
Add equivalences to the
r
equi
r
ed consequences shown
.
.
.
commit
|
commitdiff
|
tree
2014-04-10
Arthur Daussy
Add
desc
r
ipti
o
n
f
or "UML refined e
l
em
e
nt" filter
.
commit
|
commitdiff
|
tree
2014-04-10
Arthur Dau
s
sy
Add
a
description
to
"D
i
agram Ref
i
ned
el
e
ments"
.
commit
|
commitdiff
|
tree
2014-04-10
Arthur Daus
s
y
Add des
c
ription and l
a
b
el to "Diagram
post proce
s
sor"
commit
|
commitdiff
|
tree
2014-04-10
Arthur Daussy
Engines
p
reference page: C
o
r
rect message dialog
commit
|
commitdiff
|
tree
2014-04-09
Axel Richard
normalize EOLs in the c
o
re (thi
r
d
pass
)
commit
|
commitdiff
|
tree
2014-04-09
Arthur Daussy
[4296
3
6] D
o
cumentation upda
t
e: Gro
u
ps
commit
|
commitdiff
|
tree
2014-04-09
Arthur
Daussy
[43
0
37
2
] Documentation update
.
commit
|
commitdiff
|
tree
2014-04-09
A
xel Richar
d
[432014] Toolbar appears twice after save
commit
|
commitdiff
|
tree
2014-04-08
Arthur Dauss
y
[430682
]
New t
e
st: Tes
t
Mode
l
Re
s
o
l
verMa
n
ager
commit
|
commitdiff
|
tree
2014-04-08
Ar
t
hur
Daussy
[43068
2
]
U
ser
Do
c
: Model resolution
commit
|
commitdiff
|
tree
2014-04-07
Arthu
r
Daussy
I
mproves pref
e
r
e
n
c
e page
U
I
.
commit
|
commitdiff
|
tree
2014-04-07
Arthur Daussy
[
4306
8
2] Improves Model
R
esolverManager
commit
|
commitdiff
|
tree
2014-04-03
Arthur
D
a
ussy
[429441] Us
e
r
d
o
c
u
p
date
:
P
os
t
processors configuration
commit
|
commitdiff
|
tree
2014-04-03
Arth
u
r Daussy
[
4
31785]
C
orrect sy
n
chronization mech
a
nis
m
commit
|
commitdiff
|
tree
2014-04-03
Arthur Dau
s
sy
[4
2
7
1
26] User doc update: Engine configuration
commit
|
commitdiff
|
tree
2014-04-02
Arthur
D
aussy
I
m
provements
a
nd co
r
rectio
n
s on MatchEngineRegi
s
t
r
y
W
r
ap
p
er
.
commit
|
commitdiff
|
tree
2014-04-02
Arthur Dau
s
sy
N
ew t
e
sts:
T
e
s
t
I
temRegi
s
try
commit
|
commitdiff
|
tree
2014-04-02
A
r
thur Daus
s
y
[429636] A
d
d Gr
o
up Synchronizat
i
on behav
i
or mecha
n
i
sm
.
commit
|
commitdiff
|
tree
2014-04-01
A
x
el Richa
r
d
[431693] T
h
e active grou
p
provide
r
is not selected
.
.
.
commit
|
commitdiff
|
tree
2014-03-31
Arthur Daussy
[42963
6
] Crea
t
e preference pa
g
e for group
s
commit
|
commitdiff
|
tree
2014-03-31
Arthur D
a
ussy
[
4306
8
2]
P
referen
c
e page for Model R
e
s
o
l
vi
n
g
mechanism
commit
|
commitdiff
|
tree
2014-03-31
Arthur Daussy
[430682
]
Refactoring of IMo
d
e
l
Resolver
commit
|
commitdiff
|
tree
2014-03-31
Axel Richard
[431495] Change
G
roup Pr
o
vider m
u
st select t
h
e firs
t
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Axel Richard
[4
0
6516] Ma
n
a
ge Parameterized Types in Comparison
commit
|
commitdiff
|
tree
2014-03-28
Axel
R
ichard
Fix typo fo
r
Compare With Each
Other in Dialog/Ed
i
tor
commit
|
commitdiff
|
tree
2014-03-28
Axel
R
ichard
[429256]
Inclu
d
e
r
ead only workspac
e
resou
r
ces in scope
commit
|
commitdiff
|
tree
2014-03-28
A
xel R
i
chard
[418472] Cannot merg
e
a move from nestedClassifier
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Mikaël Barbero
Add content merge vi
e
wer for
defa
u
lt EMFCompare content
.
.
.
commit
|
commitdiff
|
tree
2014-03-26
Axel
R
i
chard
[428916] Re
j
ecting addition
w
ith local history doesn
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
Axel Ric
h
ar
d
[406439] EMF Comp
a
re
d
oe
s
not support li
s
t with null
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
Axel Ric
h
ard
[
4
17360
]
NPE when comparing Resources not contained
.
.
.
commit
|
commitdiff
|
tree
2014-03-24
A
r
thur
D
aussy
Typo
error
in d
e
ve
l
oper documentation
.
commit
|
commitdiff
|
tree
2014-03-24
A
xe
l
Rich
a
rd
I
n
crease targetplatform
DSL
fi
l
e
s version to 2
.
0
.
1
commit
|
commitdiff
|
tree
2014-03-24
Arthur Daussy
R
e
m
o
ve useless pre
f
erence tab
.
commit
|
commitdiff
|
tree
2014-03-13
Axe
l
Richard
[429123] S
W
T
E
xception in Table
M
ergeVi
e
w
e
r when
c
han
g
i
ng
.
.
.
commit
|
commitdiff
|
tree
2014-03-13
Axel Richard
[4
2
9
1
22] Wrong label used
in St
r
u
ctu
r
eMergeVie
w
er
commit
|
commitdiff
|
tree
2014-03-13
Axel Richard
Fix
b
roken
l
i
nks i
n
develope
r
guide
commit
|
commitdiff
|
tree
2014-03-10
Axel Richard
Fix wr
o
n
g keys when put Weigh
t
Provid
e
r in Registry
commit
|
commitdiff
|
tree
2014-03-10
Axel Richard
Improves performances of
W
ei
g
htProvide
r
Registry
commit
|
commitdiff
|
tree
2014-03-10
Axel Richard
Add
W
eightProvi
d
er Regist
r
y
commit
|
commitdiff
|
tree
2014-03-07
Axel R
i
c
hard
Updat
e
RCP UI ex
t
ension p
o
i
nts references
in user
.
.
.
commit
|
commitdiff
|
tree
2014-03-05
Axel
R
ichard
Fix br
o
k
e
n links in
o
.
e
.
em
f
.
compare
.
d
o
c/FAQ
commit
|
commitdiff
|
tree
2014-03-05
Axe
l
Richard
Fix typo i
n
Mat
c
hEngineFactoryRegi
s
try
W
rapper
n
ame
commit
|
commitdiff
|
tree
2014-02-26
Axel Richar
d
Merge
remote-tra
c
king branch 'eclipse/master' into
.
.
.
commit
|
commitdiff
|
tree
2014-02-26
Ax
e
l Richard
Add
LogicalModelTest to the
S
uit
e
commit
|
commitdiff
|
tree
2014-02-25
A
x
el
R
ichar
d
Improves updateChangedD
e
pendencies() in Proj
e
c
t
ModelReso
l
v
e
r
commit
|
commitdiff
|
tree
2014-02-19
Axel Richard
Change seconds
t
o
milliseconds for s
y
stem time me
a
sures
commit
|
commitdiff
|
tree
2014-02-18
Axel Ric
h
ard
Add hea
d
line in csv file i
f
doesn't exists
commit
|
commitdiff
|
tree
2014-02-18
Axel Richard
Delet
e
csv
f
i
l
es
from repo
commit
|
commitdiff
|
tree
2014-02-18
A
x
el Ric
h
ard
Remove L
o
g
icalModel tests from s
u
ite
commit
|
commitdiff
|
tree
2014-02-17
Axel Richard
[41816
3
]
Manage dis
p
lay and merge of UML Stere
o
t
yp
e
.
.
.
commit
|
commitdiff
|
tree
2014-02-17
Axel
Richard
[4181
6
3] Use safe version of eGet an
d
eSet
in Mergers
commit
|
commitdiff
|
tree
2014-02-14
Axel Richard
Update po
m
.
xml
(
up
X
mx t
o
2048
m
)
commit
|
commitdiff
|
tree
2014-02-14
Axel Richard
Move merge viewer rel
a
ted API from provisional to public
.
commit
|
commitdiff
|
tree
2014-02-14
Axel Richard
Move C
o
nten
t
M
e
rg
e
Vie
w
er acc
e
ssor rela
t
ed API
fro
m
p
rovisio
n
a
.
.
.
commit
|
commitdiff
|
tree
2014-02-14
A
xe
l
Richard
update
luna tp
commit
|
commitdiff
|
tree
2014-02-14
Ax
e
l Richard
upda
t
e default steps n
u
mber from 5 to 3
commit
|
commitdiff
|
tree
2014-02-13
Axe
l
Richard
Update L
o
gical
m
odel test, up
d
ate me
a
s
ures computing
commit
|
commitdiff
|
tree
2014-02-13
Axel Ri
c
h
ard
Reinit csv files,
update
t
p
commit
|
commitdiff
|
tree
2014-02-13
Axel Richard
Rem
o
ve large m
o
del cases from t
e
sts
commit
|
commitdiff
|
tree
2014-02-12
Axel Richar
d
A
d
d
n
ew tests
commit
|
commitdiff
|
tree
2014-02-10
Axel Ri
c
har
d
Add perfor
m
a
n
ce
tests
p
lugin
s
commit
|
commitdiff
|
tree
2014-02-06
Axel
R
icha
r
d
Move filt
e
rs
&
grou
p
s related
API from
p
r
ovi
s
i
o
nal
.
.
.
commit
|
commitdiff
|
tree
2014-02-01
A
x
el R
i
c
h
a
rd
U
p
date target
p
l
atform for Lu
n
a M5
commit
|
commitdiff
|
tree
2014-01-28
A
x
el R
i
chard
[
426726]
A
"toString
(
)" is returned for th
e
label of
.
.
.
commit
|
commitdiff
|
tree
2014-01-28
Axel Richard
Improve pe
r
f
o
rma
n
ce of Project
M
odelResolve
r
commit
|
commitdiff
|
tree
2013-11-19
Axel Ric
h
ard
F
i
x conditi
o
n bug in
P
roximityEO
b
jectMatche
r
#createMatches
commit
|
commitdiff
|
tree
2013-11-12
Axel Richard
[421083
]
Fix Difference Group providers are shared
.
.
.
commit
|
commitdiff
|
tree
2013-10-30
Axel
R
ic
h
ard
[41641
3
] Fix Diff
e
r
ence not selected in content merge
.
.
.
commit
|
commitdiff
|
tree
2013-10-09
Axe
l
Richar
d
[40
9
004]
-
F
ix The '
m
e
r
ge all' ac
t
i
o
n doesn'
t
set the
.
.
.
commit
|
commitdiff
|
tree
next