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
Configures Q7 tests to run on Mars platform
2014-11-03
A
r
t
hur Daussy
C
onfi
g
u
r
es Q7 t
e
sts
t
o run on
Mars
p
latform
commit
|
commitdiff
|
tree
2014-10-08
Axel Richar
d
[439036] FeatureMap filter shouldn't hide
d
iff
s
with
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-10-02
Axel Richa
r
d
Bumping minor f
o
r all plu
g
ins
/
f
e
atures changed since
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-25
Axel Richard
[442887]
P
r
otect compare acti
o
ns from over-enthus
i
as
t
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-19
Axel Richard
[444351]
Fix bug in Equality
H
e
lper
.
m
a
tc
h
ingArr
a
ys
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-17
Alexandra Buzila
Fixed
t
y
p
os in the Tutorial, D
e
v
e
l
oper gui
d
e, Logica
l
.
.
.
commit
|
commitdiff
|
tree
2014-09-15
Arthur Daussy
[441089] N
a
g
i
va
t
ion bet
w
een differen
c
e
s
now
u
ses
a
n
.
.
.
commit
|
commitdiff
|
tree
2014-09-15
A
r
thur Daussy
[443330] Load
UML s
t
a
t
i
c p
r
ofile using path map
commit
|
commitdiff
|
tree
2014-09-15
A
r
thur Daussy
[4433
3
0] Avoid getting a "Profile version change" error
.
commit
|
commitdiff
|
tree
2014-09-15
Arthur Daussy
[
4
43330] Improves U
R
I
handling
.
commit
|
commitdiff
|
tree
2014-07-03
A
xel Richard
FeatureMaps:
A
dd new
D
iff: FeatureMa
p
Change
commit
|
commitdiff
|
tree
2014-06-26
A
rthur
Daussy
Regenerates EMF Co
m
pa
r
e static te
s
t
profile
.
commit
|
commitdiff
|
tree
2014-06-26
Arthur Dau
s
sy
Adds UMLSter
e
otyped
E
le
m
entChange post proce
s
sor
.
commit
|
commitdiff
|
tree
2014-06-20
L
a
urent Goubet
avoid f
a
il
u
res comparing files at repository r
o
ot
commit
|
commitdiff
|
tree
2014-06-20
Axel
R
ic
h
ard
E
MF Compare doc
:
Add
tut
o
rial to ind
e
x
commit
|
commitdiff
|
tree
2014-06-20
Arthur
D
a
ussy
EMF Compa
r
e tutor
i
al
:
T
utori
a
l
part 1
commit
|
commitdiff
|
tree
2014-06-20
Ar
t
hur Dau
s
sy
EMF
C
o
mpa
r
e tutorial: EXTlibr
a
ry
p
l
u
gin
s
commit
|
commitdiff
|
tree
2014-06-03
Axel Richa
r
d
[435251] [4
3
52
5
2]
U
p
d
ate
d
oc for
L
una
commit
|
commitdiff
|
tree
2014-05-28
Axel Ri
c
hard
[43
4
828] Test M
e
rge
C
onflic
t
Diff With Conflicting
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Arth
u
r Dauss
y
[
4
3
4
828] Test Merge Conflic
t
Diff With Conflic
t
i
ng
.
.
.
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-28
Arthur
D
a
ussy
[434822]
C
onfli
c
t between mov
e
and delete
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-27
Ax
e
l
R
i
c
ha
r
d
[435743] Fix Diagra
m
s node ar
e
not disp
l
a
y
e
d
anymore
.
.
.
commit
|
commitdiff
|
tree
2014-05-26
Axel Richar
d
[435617] Fix Structure Me
r
g
e
V
iewer content
w
ith refined
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Arth
u
r Daussy
[
43
5
36
5
] Ca
s
cading
F
i
lt
e
r shouldn't filter
o
ut changes
.
.
.
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-23
Ax
e
l Ri
c
hard
[43
1
882]
F
ix I
l
legalS
t
ateException in case of Pseudo
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
A
x
el Richard
[
4
35053] Add P
s
eudo
c
onflicts tests
.
commit
|
commitdiff
|
tree
2014-05-21
Axe
l
R
i
chard
[
4
35376] Con
f
li
c
t
ed subd
i
ffs
s
hou
l
d
n't be mer
g
ed when
.
.
.
commit
|
commitdiff
|
tree
2014-05-20
Arthur Daussy
[434
8
2
7
] Wrong overlay icon after merge
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-20
Axel R
i
char
d
[434866] Real
A
dd C
o
nflict
Display
commit
|
commitdiff
|
tree
2014-05-07
A
xel R
i
chard
[4342
0
0] Accept/R
e
ject differe
n
c
e
fails in some cases
commit
|
commitdiff
|
tree
2014-05-06
Ax
e
l Richard
[
4
3
4
165] M
a
rk consequences as merge
commit
|
commitdiff
|
tree
2014-05-06
Axel
R
i
c
h
ard
[431643] Fix Manage case of no se
l
ected
i
tem
.
commit
|
commitdiff
|
tree
2014-05-05
Axel Rich
a
rd
[4316
4
3] Fix Mana
g
e case of no sele
c
ted item
.
commit
|
commitdiff
|
tree
2014-05-05
Axel Ri
c
hard
Add pseud
o
conflict
diffs to the
requir
e
d conse
q
uences
.
.
.
commit
|
commitdiff
|
tree
2014-04-28
Axe
l
Richard
[
4
3
1
643] Manage ca
s
e of n
o
selected it
e
m
.
commit
|
commitdiff
|
tree
2014-04-28
Axel Richa
r
d
[4
3
1
643]
M
anage c
a
ses of
no differences and no
vi
s
ibl
e
.
.
.
commit
|
commitdiff
|
tree
2014-04-17
Axel R
i
chard
Add
e
quival
e
n
c
es to t
h
e r
e
quired conseque
n
c
e
s s
h
ow
n
.
.
.
commit
|
commitdiff
|
tree
2014-04-10
Arthur Dau
s
sy
Add
d
es
c
ription for "
U
ML refined
e
lement" filte
r
.
commit
|
commitdiff
|
tree
2014-04-10
Arth
u
r Daussy
Add
a
description
t
o "Diagram Refined elements"
.
commit
|
commitdiff
|
tree
2014-04-10
Arthur Dauss
y
Add description and l
a
bel to "Diagra
m
post processor"
commit
|
commitdiff
|
tree
2014-04-10
Arthur Daussy
Engines
p
refer
e
nce p
a
ge:
Correc
t
m
ess
a
g
e dia
l
og
commit
|
commitdiff
|
tree
2014-04-09
Axel Richard
normalize EOLs in
the core (third
pass
)
commit
|
commitdiff
|
tree
2014-04-09
A
r
thur
D
a
ussy
[429
6
3
6
] Docu
m
entation update:
Groups
commit
|
commitdiff
|
tree
2014-04-09
Arthur Daussy
[4303
7
2] Do
c
u
mentation
u
pd
a
te
.
commit
|
commitdiff
|
tree
2014-04-09
Axel
Rich
a
rd
[432014
]
Toolbar appea
r
s twic
e
after
s
ave
commit
|
commitdiff
|
tree
2014-04-08
Ar
t
hur Daussy
[43068
2
]
New test: Tes
t
ModelRes
o
lve
r
M
anager
commit
|
commitdiff
|
tree
2014-04-08
Ar
t
hu
r
Dauss
y
[430682] User Doc: M
o
del re
s
o
l
ution
commit
|
commitdiff
|
tree
2014-04-07
Arthur
Daussy
Improves preference page UI
.
commit
|
commitdiff
|
tree
2014-04-07
Arthur Daussy
[430682] Impro
v
es Mode
l
R
e
solverManag
e
r
commit
|
commitdiff
|
tree
2014-04-03
Arthur Dau
s
sy
[429441] U
s
er
d
o
c
update: Post processors configuration
commit
|
commitdiff
|
tree
2014-04-03
Arthur Daussy
[431785] Corre
c
t synch
r
o
n
ization
m
ec
h
anism
commit
|
commitdiff
|
tree
2014-04-03
Art
h
ur
Daussy
[427126] Us
e
r doc upd
a
te: Engi
n
e conf
i
gura
t
ion
commit
|
commitdiff
|
tree
2014-04-02
Arthur Daus
s
y
Improve
m
ents a
n
d corrections o
n
MatchEngi
n
e
RegistryWrap
p
e
r
.
commit
|
commitdiff
|
tree
2014-04-02
Art
h
ur
D
auss
y
New te
s
ts
:
Test ItemRegistry
commit
|
commitdiff
|
tree
2014-04-02
A
rth
u
r Daus
s
y
[429
6
36] A
d
d
Group Synchr
o
n
iz
a
tion beha
v
ior mechanism
.
commit
|
commitdiff
|
tree
2014-04-01
A
x
el Rich
a
rd
[431693] The active group provider is not sele
c
t
ed
.
.
.
commit
|
commitdiff
|
tree
2014-03-31
Arthur Daus
s
y
[429636] Cr
e
a
t
e preferenc
e
pag
e
f
or groups
commit
|
commitdiff
|
tree
2014-03-31
Arth
u
r
D
aussy
[
4
3
0682]
P
r
e
ference page for Model R
e
solving mechanism
commit
|
commitdiff
|
tree
2014-03-31
Arthur Dau
s
sy
[
4
30
6
82] Refacto
r
ing of IModelR
e
s
o
l
ver
commit
|
commitdiff
|
tree
2014-03-31
A
xel
R
i
c
hard
[431495] Change
Gr
o
up Pro
v
ider
m
u
s
t sel
e
ct t
h
e fi
r
s
t
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Axel Ri
c
h
ard
[406516
]
Ma
n
age Paramete
r
ized Types in Comparison
commit
|
commitdiff
|
tree
2014-03-28
Axel Richa
r
d
F
i
x ty
p
o for Compare With E
a
ch Other in Dialog/Editor
commit
|
commitdiff
|
tree
2014-03-28
A
xel Richa
r
d
[
4
29256]
I
ncl
u
d
e read
o
nly wo
r
ks
p
ac
e
r
es
o
urces
in scope
commit
|
commitdiff
|
tree
2014-03-28
Ax
e
l Richard
[418472] Cannot merge a move
fro
m
ne
s
t
ed
C
lassifier
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Mikaël Barbe
r
o
Add c
o
ntent merge view
e
r for default EM
F
Compare
c
o
n
t
e
n
t
.
.
.
commit
|
commitdiff
|
tree
2014-03-26
Axel Richard
[428916] Reje
c
tin
g
ad
d
ition with local history doesn
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
Axel Rich
a
rd
[406439]
E
MF Compar
e
does not supp
o
rt list with null
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
Axel Richard
[417360]
N
P
E when comparing Re
s
ourc
e
s not cont
a
ined
.
.
.
commit
|
commitdiff
|
tree
2014-03-24
Arthur Daussy
Typo
erro
r
in de
v
eloper documen
t
atio
n
.
commit
|
commitdiff
|
tree
2014-03-24
Axel
Richard
Incre
a
se targetplatform DSL files version
t
o 2
.
0
.
1
commit
|
commitdiff
|
tree
2014-03-24
Arthur Daussy
R
e
move useless preference tab
.
commit
|
commitdiff
|
tree
2014-03-13
A
x
e
l Richard
[4
2
9
123
]
SWTExce
p
tion
in Tab
l
eMerge
V
iewer
when
c
hanging
.
.
.
commit
|
commitdiff
|
tree
2014-03-13
Axel Richard
[
4
291
2
2] Wr
o
n
g
l
ab
e
l used in Structu
r
e
M
er
g
eVi
e
we
r
commit
|
commitdiff
|
tree
2014-03-13
A
xel Rich
a
r
d
Fix b
r
oken
l
i
n
ks in developer guide
commit
|
commitdiff
|
tree
2014-03-10
Axel
R
ichard
F
ix
w
rong
k
eys when
p
ut We
i
g
h
tProvid
e
r
in Reg
i
stry
commit
|
commitdiff
|
tree
2014-03-10
Axel Rich
a
rd
I
m
p
r
ove
s
performances
of
W
eig
h
tProvider R
e
g
i
stry
commit
|
commitdiff
|
tree
2014-03-10
Axel Richard
A
d
d
Wei
g
ht
P
rovider Registry
commit
|
commitdiff
|
tree
2014-03-07
Axel
Richard
Upd
a
te RCP UI extension poin
t
s referen
c
e
s
i
n user
.
.
.
commit
|
commitdiff
|
tree
2014-03-05
Axel Richard
Fix broken links in o
.
e
.
emf
.
co
m
pare
.
doc/FAQ
commit
|
commitdiff
|
tree
2014-03-05
Axel Richar
d
Fix
t
ypo i
n
Mat
c
h
EngineFactoryRegist
r
yWrapper name
commit
|
commitdiff
|
tree
2014-02-26
Axel Ric
h
ar
d
Merge r
e
mote-tracki
n
g b
r
a
n
c
h 'e
c
lipse/master' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2014-02-26
Axel Richard
A
d
d LogicalModel
T
est to the
Suite
commit
|
commitdiff
|
tree
2014-02-25
Axel Richard
Impr
o
ves
updateCha
n
g
edDep
e
ndenc
i
es() i
n
Pro
j
ectMo
d
elResolver
commit
|
commitdiff
|
tree
2014-02-19
Axel Rich
a
rd
Cha
n
ge s
e
c
o
n
d
s to mi
l
liseconds for
system
time measures
commit
|
commitdiff
|
tree
2014-02-18
Axel
Richard
Add
h
e
a
dli
n
e in
csv file if doesn't ex
i
sts
commit
|
commitdiff
|
tree
2014-02-18
Axel Richard
Delete csv files from repo
commit
|
commitdiff
|
tree
2014-02-18
Axel
R
ic
h
ard
Remo
v
e LogicalModel te
s
ts from suite
commit
|
commitdiff
|
tree
2014-02-17
Axel Richard
[418163] M
a
n
a
ge
di
s
play an
d
m
e
r
g
e
of U
M
L Ster
e
otype
.
.
.
commit
|
commitdiff
|
tree
2014-02-17
A
x
el Richard
[418163] Use
safe
versio
n
of eGet and eS
e
t in
Mergers
commit
|
commitdiff
|
tree
2014-02-14
Axel Rich
a
rd
Updat
e
pom
.
xml (up X
m
x to 204
8
m)
commit
|
commitdiff
|
tree
2014-02-14
Axel Ric
h
ar
d
Move m
e
rge
v
i
ewer rela
t
ed API from
p
rovis
i
onal to pu
b
lic
.
commit
|
commitdiff
|
tree
2014-02-14
A
xel
R
ichard
M
o
ve ContentMergeViewer accessor related API from pro
v
isi
o
na
.
.
.
commit
|
commitdiff
|
tree
2014-02-14
Axel Richard
upda
t
e lu
n
a t
p
commit
|
commitdiff
|
tree
2014-02-14
Axel Richard
upd
a
te defaul
t
steps
n
u
m
ber from 5 to 3
commit
|
commitdiff
|
tree
2014-02-13
Axel Richard
U
p
dat
e
Logical model test,
u
pdate
m
easures
comp
u
t
i
ng
commit
|
commitdiff
|
tree
2014-02-13
Axel Richa
r
d
Reinit
c
s
v files, update
t
p
commit
|
commitdiff
|
tree
2014-02-13
Axel
R
i
c
hard
Remove la
r
ge model
cas
e
s
from tests
commit
|
commitdiff
|
tree
2014-02-12
A
x
el
Richard
A
d
d new t
e
sts
commit
|
commitdiff
|
tree
2014-02-10
Axel R
i
chard
Add pe
r
formance test
s
plugins
commit
|
commitdiff
|
tree
2014-02-06
A
x
e
l Rich
a
rd
Move filters & gro
u
ps r
e
late
d
API f
r
om
prov
i
sional
.
.
.
commit
|
commitdiff
|
tree
next