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
Arthur Dauss
y
Confi
g
ure
s
Q7 te
s
t
s
t
o r
u
n
on
Mars platf
o
r
m
commit
|
commitdiff
|
tree
2014-10-08
Ax
e
l
R
ichard
[
439
0
36] FeatureMap
filter shouldn't
h
ide dif
f
s wit
h
.
.
.
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-10-02
Axel Richard
Bumpi
n
g minor
f
or
a
ll plu
g
in
s
/features change
d
since
.
.
.
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-09-25
Axel Richar
d
[
44
2
887] Pr
o
tect compare actions from over-enthusiast
.
.
.
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-09-19
Axel Richard
[444351] Fix bug in
E
q
u
alityHelper
.
matchingArr
a
ys
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-09-17
Alexand
r
a Buzila
Fi
x
e
d
typos in the Tutor
i
al, Developer
g
ui
d
e
,
Log
i
cal
.
.
.
commit
|
commitdiff
|
tree
2014-09-15
Arthur Daussy
[4
4
1089] Nagivation b
e
t
ween differences now uses an
.
.
.
commit
|
commitdiff
|
tree
2014-09-15
Arthur
Daussy
[4433
3
0] Load
U
ML sta
t
i
c
profile using path map
commit
|
commitdiff
|
tree
2014-09-15
Art
h
ur Daussy
[
4
4
3
330] Avoid
g
etting a
"Pr
o
file version
chan
g
e" error
.
commit
|
commitdiff
|
tree
2014-09-15
Ar
t
hur
D
a
u
s
s
y
[
4
43330] Impro
v
e
s URI ha
n
dling
.
commit
|
commitdiff
|
tree
2014-07-03
Axel Richard
FeatureMaps: Add new Diff: Fea
t
ureMapChange
commit
|
commitdiff
|
tree
2014-06-26
Arthur Da
u
ssy
Regener
a
tes EMF
Compare static test
p
rof
i
l
e
.
commit
|
commitdiff
|
tree
2014-06-26
Arthur Daussy
Adds UMLS
t
ereotypedElement
C
hange pos
t
proc
e
ssor
.
commit
|
commitdiff
|
tree
2014-06-20
L
a
urent Goubet
avoid failures compari
n
g
f
iles at
r
eposit
o
r
y
root
commit
|
commitdiff
|
tree
2014-06-20
Ax
e
l
Richar
d
EMF
C
ompare doc
:
Add tutori
a
l to inde
x
commit
|
commitdiff
|
tree
2014-06-20
Arthur
D
aus
s
y
EMF Compa
r
e
t
uto
r
ial: Tu
t
orial part
1
commit
|
commitdiff
|
tree
2014-06-20
Arthur Daussy
EMF Comp
a
re tutorial: EXTl
i
bra
r
y
pl
u
gins
commit
|
commitdiff
|
tree
2014-06-03
Axel
Richard
[4
3
52
5
1] [43
5
252] Update do
c
for
L
una
commit
|
commitdiff
|
tree
2014-05-28
Axel R
i
cha
r
d
[434828] Test Merge Confli
c
t Diff With Conflicting
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Arthur
D
aussy
[4348
2
8]
T
est
M
erge Conflict Diff With Conflicti
n
g
.
.
.
Also-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-05-28
A
r
t
h
ur
D
aussy
[434822] Conflict between move and delete
Also-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-05-27
Axel Ric
h
ard
[
4
35743] Fi
x
Diagrams node are not di
s
playe
d
anymo
r
e
.
.
.
commit
|
commitdiff
|
tree
2014-05-26
Axel
Ri
c
hard
[43561
7
] Fix Structure Merge
Viewer cont
e
nt with
refined
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Ar
t
hur Daus
s
y
[435365] CascadingFilte
r
sh
o
uldn
'
t fil
t
e
r
o
u
t
changes
.
.
.
Also-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-05-23
Ax
e
l Ric
h
ar
d
[43
1
882] Fix Ill
e
g
a
lStateException in ca
s
e of Pseudo
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Axel Rich
a
rd
[43
5
053] A
d
d Pseud
o
c
o
nflic
t
s tests
.
commit
|
commitdiff
|
tree
2014-05-21
Axel
R
ichard
[435376] Conflic
t
ed
subdiffs shouldn't b
e
m
erged whe
n
.
.
.
commit
|
commitdiff
|
tree
2014-05-20
Arthur Da
u
s
s
y
[43
4
8
2
7] Wrong
o
verla
y
icon after merg
e
Also-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-05-20
Axel
R
i
chard
[434866] R
e
a
l Add Conflict Display
commit
|
commitdiff
|
tree
2014-05-07
Axel Richard
[434
2
00] Acce
p
t/Rej
e
ct difference fails i
n
some cases
commit
|
commitdiff
|
tree
2014-05-06
Axel Richard
[43416
5
] Mark con
s
eq
u
ences as merge
commit
|
commitdiff
|
tree
2014-05-06
Axel Richard
[431643] Fix Man
a
ge case of no
selec
t
ed item
.
commit
|
commitdiff
|
tree
2014-05-05
Axel Ric
h
ard
[4
3
1643]
Fix Manage case of no selecte
d
item
.
commit
|
commitdiff
|
tree
2014-05-05
Axel Richa
r
d
Add pseudo conflict diffs to the required con
s
equ
e
n
ces
.
.
.
commit
|
commitdiff
|
tree
2014-04-28
Axel Richa
r
d
[431643] Ma
n
age case of
n
o s
e
lected item
.
commit
|
commitdiff
|
tree
2014-04-28
Axel Richard
[431643]
M
anage cases of no
d
i
f
ferences and no visible
.
.
.
commit
|
commitdiff
|
tree
2014-04-17
Axel
Richard
Add eq
u
ivalences to
t
he req
u
ire
d
consequences
shown
.
.
.
commit
|
commitdiff
|
tree
2014-04-10
Arthur Dau
s
sy
Add description for
"UML
r
efined element" f
i
lter
.
commit
|
commitdiff
|
tree
2014-04-10
Arthur Daussy
A
dd a
desc
r
iptio
n
to "Diagram
Refined elements"
.
commit
|
commitdiff
|
tree
2014-04-10
Art
h
ur
Daussy
Add description and label to
"Diagram post
p
roc
e
ss
o
r"
commit
|
commitdiff
|
tree
2014-04-10
Art
h
ur Daussy
Eng
i
nes preference page: C
o
rrect messag
e
dialog
commit
|
commitdiff
|
tree
2014-04-09
Axel Richard
normalize
E
OL
s
in
t
he
c
o
r
e (third
p
ass)
commit
|
commitdiff
|
tree
2014-04-09
Arthur D
a
ussy
[4
2
9636] Docu
m
e
ntation update: Groups
commit
|
commitdiff
|
tree
2014-04-09
Ar
t
hur
Daussy
[430
3
7
2] Documen
t
a
t
ion updat
e
.
commit
|
commitdiff
|
tree
2014-04-09
Axel
Richa
r
d
[4320
1
4] T
o
olbar appears tw
i
ce
a
f
t
er save
commit
|
commitdiff
|
tree
2014-04-08
Arthu
r
Da
u
ssy
[430
6
82] Ne
w
test: Test Mode
l
ResolverMana
g
er
commit
|
commitdiff
|
tree
2014-04-08
Arthur
D
au
s
sy
[43068
2
] User Doc: Mode
l
reso
l
ution
commit
|
commitdiff
|
tree
2014-04-07
A
r
thu
r
D
a
ussy
Impro
v
es pre
f
erence page UI
.
commit
|
commitdiff
|
tree
2014-04-07
A
r
thur
D
aus
s
y
[430682] Impro
v
es Mo
d
elR
e
solverMana
g
e
r
commit
|
commitdiff
|
tree
2014-04-03
Ar
t
hur D
a
ussy
[
4
2
9441] User doc update: Post proc
e
ssors
c
o
n
figuration
commit
|
commitdiff
|
tree
2014-04-03
Arthur Daussy
[431785] Corre
c
t synchron
i
zation mechanism
commit
|
commitdiff
|
tree
2014-04-03
Arthur Daussy
[427126] Us
e
r doc upd
a
t
e
: Engine c
o
nf
i
guration
commit
|
commitdiff
|
tree
2014-04-02
Arthur Daussy
Improvements and corrections
o
n
Matc
h
En
g
ineR
e
gistry
W
rapper
.
commit
|
commitdiff
|
tree
2014-04-02
Arthur Daussy
New tests:
T
est ItemR
e
gistr
y
commit
|
commitdiff
|
tree
2014-04-02
Arthur Daussy
[429636
]
Add Group Sync
h
ron
i
zation
b
ehavior m
e
chani
s
m
.
commit
|
commitdiff
|
tree
2014-04-01
Axel Richard
[431
6
93] The active gr
o
up provi
d
er i
s
not
selec
t
ed
.
.
.
commit
|
commitdiff
|
tree
2014-03-31
Art
h
ur D
a
ussy
[42
9
63
6
]
Create preference
p
a
ge for groups
commit
|
commitdiff
|
tree
2014-03-31
A
r
thur Daussy
[
430682] Preference pag
e
for
Model Resolving mechanism
commit
|
commitdiff
|
tree
2014-03-31
A
r
thur Daussy
[
4
30682] Re
f
actor
i
ng of IModelResolver
commit
|
commitdiff
|
tree
2014-03-31
Axel Richard
[4
3
1495] Ch
a
n
g
e G
r
oup
P
rovider must sele
c
t t
h
e firs
t
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Axel Richard
[40651
6
] Manag
e
Parameterized Typ
e
s in Comparison
commit
|
commitdiff
|
tree
2014-03-28
Ax
e
l Richard
Fix
typo for Compa
r
e W
i
th Each Other in Dialog/Edit
o
r
commit
|
commitdiff
|
tree
2014-03-28
Axel Richard
[4
2
9256] I
n
c
lude
re
a
d o
n
ly workspace
r
esour
c
e
s in scop
e
commit
|
commitdiff
|
tree
2014-03-28
Axel Richard
[418
4
72] Cannot
m
e
r
g
e
a
m
o
ve from nestedCl
a
ss
i
fier
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
M
i
kaël Barbero
A
dd c
o
ntent merge
vie
w
er for default E
M
FCo
m
pare
content
.
.
.
commit
|
commitdiff
|
tree
2014-03-26
Axel Richard
[42
8
9
1
6] Rejecting additi
o
n with loca
l
hi
s
tory
d
o
e
s
n
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
Axel Richard
[40
6
439] EMF
C
omp
a
r
e does not support list w
i
t
h
n
u
l
l
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
Axel Richard
[
4
173
6
0
] NPE when comparing Resources not containe
d
.
.
.
commit
|
commitdiff
|
tree
2014-03-24
A
r
th
u
r Daus
s
y
T
ypo
error in deve
l
oper documentation
.
commit
|
commitdiff
|
tree
2014-03-24
Axel Richar
d
Inc
r
ease targetp
l
a
tform DSL
fil
e
s v
e
r
s
ion to 2
.
0
.
1
commit
|
commitdiff
|
tree
2014-03-24
Arthur Daussy
Remove
u
seless pr
e
ference tab
.
commit
|
commitdiff
|
tree
2014-03-13
A
x
el Richard
[429123] SW
T
E
x
ception in Ta
b
leMerg
e
Viewer when changing
.
.
.
commit
|
commitdiff
|
tree
2014-03-13
Axel Richard
[4291
2
2] Wrong label used i
n
Str
u
ctureMergeView
e
r
commit
|
commitdiff
|
tree
2014-03-13
Axel Richard
Fix bro
k
en links
in developer guide
commit
|
commitdiff
|
tree
2014-03-10
Axe
l
Richard
Fi
x
w
rong k
e
ys when
put Wei
g
htProvider in
Registry
commit
|
commitdiff
|
tree
2014-03-10
Axel R
i
chard
Improv
e
s
p
erformances o
f
WeightProvide
r
R
egistry
commit
|
commitdiff
|
tree
2014-03-10
A
xel Ric
h
ard
Add W
e
ight
P
rovider Registry
commit
|
commitdiff
|
tree
2014-03-07
Axe
l
Richa
r
d
Update
R
C
P
UI
e
xtension points refe
r
e
n
ces in user
.
.
.
commit
|
commitdiff
|
tree
2014-03-05
Axel
Richard
Fix broken links in o
.
e
.
emf
.
compare
.
d
o
c
/
FAQ
commit
|
commitdiff
|
tree
2014-03-05
Axe
l
Ri
c
hard
Fix ty
p
o in
Ma
t
chEngine
F
a
c
to
r
y
R
egistryWrapper name
commit
|
commitdiff
|
tree
2014-02-26
Axel Ri
c
ha
r
d
Me
r
ge remote
-
tracking
branch
'
eclips
e
/master'
into
.
.
.
commit
|
commitdiff
|
tree
2014-02-26
Axel Richard
Add
Logic
a
lM
o
delTest to t
h
e
S
u
i
t
e
commit
|
commitdiff
|
tree
2014-02-25
Axel Richard
Improves u
p
dateChangedD
e
p
endencies()
in ProjectMo
d
elResolver
commit
|
commitdiff
|
tree
2014-02-19
A
x
el Richard
C
ha
n
ge second
s
to
m
illisecon
d
s for sy
s
te
m
time measure
s
commit
|
commitdiff
|
tree
2014-02-18
Axel Richard
Add headline in csv file if
d
o
es
n
't
e
xists
commit
|
commitdiff
|
tree
2014-02-18
Axel Richard
Delete
csv
files from repo
commit
|
commitdiff
|
tree
2014-02-18
Axel Richard
R
em
o
ve LogicalModel tests from s
u
ite
commit
|
commitdiff
|
tree
2014-02-17
Axel
Richard
[418163] Manage display a
n
d merge o
f
UML Stereo
t
ype
.
.
.
commit
|
commitdiff
|
tree
2014-02-17
A
xel Richard
[418163] Use safe version
of eGet a
n
d eSe
t
in Mergers
commit
|
commitdiff
|
tree
2014-02-14
Axel Rich
a
r
d
Up
d
a
te pom
.
x
ml
(
up Xmx to 2048m)
commit
|
commitdiff
|
tree
2014-02-14
Axel Richard
Move
merge viewer
r
e
l
ated API from provi
s
i
onal to
pu
b
lic
.
commit
|
commitdiff
|
tree
2014-02-14
Axel Richard
M
o
ve ContentMerg
e
Vie
w
er acce
s
sor related
A
PI
f
rom
p
rovisi
o
na
.
.
.
commit
|
commitdiff
|
tree
2014-02-14
Axel
R
i
c
hard
u
pdate luna tp
commit
|
commitdiff
|
tree
2014-02-14
Axel Richard
u
p
date default steps nu
m
ber from
5
t
o 3
commit
|
commitdiff
|
tree
2014-02-13
Axel Rich
a
rd
Update
L
o
gical model test
,
update mea
s
ures c
o
mputing
commit
|
commitdiff
|
tree
2014-02-13
Axel Richard
R
e
init csv file
s
,
update tp
commit
|
commitdiff
|
tree
2014-02-13
Axel Ri
c
h
a
r
d
Remove
large model
c
ases
f
r
om
te
s
ts
commit
|
commitdiff
|
tree
2014-02-12
Axel
Richard
A
dd n
e
w
tests
commit
|
commitdiff
|
tree
2014-02-10
Axel
Richard
Add
p
e
r
form
a
nc
e
t
e
s
ts
p
lugins
commit
|
commitdiff
|
tree
2014-02-06
Axel
R
ich
a
r
d
Move fil
t
ers
&
g
rou
p
s
r
elat
e
d API from provisional
.
.
.
commit
|
commitdiff
|
tree
next