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
Update mars-sdk target platform for Mars M7
2015-05-11
A
x
el R
i
ch
a
rd
U
p
date m
a
rs-sdk t
a
rget pl
a
tf
o
rm for M
a
r
s M7
commit
|
commitdiff
|
tree
2015-05-06
Axel
R
i
chard
[UI Tests
]
- Update Q7 Tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-06
Axel Richard
[UI Tests] - U
p
date
Q
7
T
es
t
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-05
A
x
el Rich
a
rd
[46
3
785] Res
o
urceLoc
a
t
i
onChange
:
UI change
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-05
Axel Ri
c
hard
[463785] R
e
s
ourceLoca
t
i
onChange: cor
e
c
hang
e
s
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-27
Axel
Richard
[463
7
85
]
Add
n
ew
c
oncept in EMF Compar
e
: Res
o
urce
L
ocationChange
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-17
Axel Richar
d
Fi
x
U
nsupportedO
p
er
a
tio
n
Exceptio
n
in ThreadedModelResolve
r
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-16
Axel Richard
[46
4
6
1
3
]
Che
c
k if
URIs ex
i
st i
n
th
e
model dependency
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-14
A
x
el Richard
[UI Tests] Upd
a
te ui tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-14
Axel Richa
r
d
[464
3
7
9
]
M
a
t
c
h
i
ng resources should u
s
e
id str
a
tegy
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-13
Axe
l
R
i
c
hard
R
emove
fuzzy from all
target platforms
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-07
Axel Richard
[4
6
344
5
]
Fix potent
i
al NP
E
in EMFCompareStru
c
tureMergeView
e
r
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-07
Ax
e
l R
i
chard
[462550
]
Fix re
s
ourceSetH
o
ok e
x
tens
i
o
n
-pont ID
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-01
A
x
el
R
icha
r
d
[442265][46
0
782]
A
vo
i
d Inf
i
nite "please w
a
it" vie
w
er
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-30
Axel Ri
c
hard
[UI Tests] Update AUTs
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-30
Ax
e
l R
i
chard
[UI Tes
t
s] Update A
U
Ts
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-26
Axel Richard
[442265][46
0
782] Avoid Infi
n
ite "pleas
e
wait" vie
w
er
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-24
A
x
el Ric
h
ard
[461986] [UI] Tests - Intermedi
a
te Proxies Res
o
lut
i
on
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-24
Axel R
i
chard
[461986] Fix bug
in Intermediate Proxie
s
R
esolution
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-17
A
x
el
R
ic
h
a
r
d
[46
1
224]
F
i
x NoSuc
h
ElementExcept
i
o
n
in Graph
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-17
Axel
Richard
[4
6
1
986] Tests - Int
e
rmediate Proxies Resolutio
n
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-17
Axel Richar
d
[461986] Intermed
i
ate P
r
o
x
ies Resoluti
o
n
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-17
A
x
el Richard
[
4
6
2
203] Child ma
t
ch appear as top-level match
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-13
A
xe
l
R
i
c
h
a
r
d
[4
4
2
227] Comp
a
re an untracked file with HEAD
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-04
A
xel
Richa
r
d
[458963] EMFCo
m
pare object doesn't use EMF
C
om
p
areRC
P
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-04
Axe
l
Ric
h
ard
P
e
rformances tests: increase max me
m
ory & max perm
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-02
Axel Ri
c
h
a
r
d
[4589
6
8] Fix Re
j
ecting
Diagra
m
Change ca
u
s
e
s
NPE
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-02
Axel R
i
chard
Fix
co
r
e featu
r
e name t
o
be consistent with other featu
r
es
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-02
A
x
el Richard
[
413038]
F
ix Prop
e
rties View: edi
t
a
v
a
l
ue changes
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-26
Axel Ric
h
ard
[434621]
RootID
M
a
tching
S
t
r
at
e
g
y ma
t
c
he
s
incorrect
l
y
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-11
A
x
el Richard
[UI Te
s
ts] Update q7 tests config
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
A
x
e
l
Ric
h
ard
[UI
]
Update q7
t
ests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
Ax
e
l Ric
h
ard
[4360
5
0
] Fix cop
y
all
does
nothing
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
Axel Richard
[456796
]
Cascadi
n
g filter sho
u
ldn't
h
i
d
e move diff
e
r
ences
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
Axel Richard
[413038]
F
ix Properties View
:
edit
a value ch
a
nges
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
Axel Ric
h
a
rd
[459131] F
i
x Logica
l
Model Resour
c
es Graph update
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
Axel Ric
h
a
r
d
Update
Q
7
AUT for
Mar
s
M5
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-27
Axel Richard
Add large spli
t
git uml model
s
to performances t
e
sts
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-27
Ax
e
l
R
ich
a
rd
Imp
r
o
ves git
p
erformances tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-27
Ax
e
l Richard
Add
nominal split g
i
t uml models to pe
r
for
m
a
n
c
e
s tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-26
Axel Richard
Fix git perfor
m
anc
e
s tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-26
Axel Richard
Fix perf
o
rmances tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-26
Axel Richar
d
A
dd small sp
l
it uml m
o
dels to git p
e
rformances tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-26
Axel
R
ichard
Allow to lo
a
d resou
r
ce
s
i
n N
o
tLoadi
n
gResourceSet after
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-26
A
xel Richard
Deactivate Match
c
on
t
en
t
tests
f
or git suite in performance
s
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-24
Axe
l
Richard
Fix performance l
a
rge git profile
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
Ax
e
l Ri
c
hard
Add
new prof
i
le:
performan
c
e large git
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
Axel
R
ichard
A
dd large
u
ml
s
ize git perf
o
rmances t
e
sts
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
Axel Richa
r
d
Add la
r
ge
s
p
l
i
t uml model
s
to p
e
rformances tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
A
xel Ri
c
hard
Rever
t
"Fix csv files for pe
r
formances tes
t
s
(
di
r
ty
.
.
.
commit
|
commitdiff
|
tree
2015-01-23
Axel Ric
h
ard
F
ix
c
s
v fil
e
s for perform
a
n
ces tests (dirty temporary
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
Axel Richard
Remo
v
e Clo
s
ing Welcome Page step from g
i
t performance
s
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
Axel Richard
A
d
d small &
n
om
i
nal size git perform
a
nces test
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-21
Axel Richard
[
U
I
]
Update t
e
st
s
for Collabo
r
a
tiv
e
Modelin
g
bu
n
dle
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-20
Axel
R
ichard
Add
L
arge UML
m
ode
l
s to performances tests in a s
e
parate
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-20
Ax
e
l Richard
Rev
e
rt "
D
RAFT
-
Interm
e
diate Proxie
s
Resolu
t
ion"
commit
|
commitdiff
|
tree
2015-01-20
A
x
el Ric
h
a
r
d
DR
A
FT - Intermediate Proxie
s
Resolution
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-20
Axel R
i
chard
Fix input for LogicalMode
l
nom
i
nal case
o
f perfor
m
anc
e
s
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-20
Axel Ri
c
hard
Ad
d
split Nominal U
M
L case
to pe
r
formances
t
ests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-19
Axel Richard
Delete FixC
S
V file (revert last commit)
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-19
Axel Richard
Fix csv files of pe
r
forman
c
es tests (
t
emporary
c
om
m
it)
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-19
A
xel Richard
Deact
i
vate Large UML Models fo
r
p
e
rformances
t
ests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-16
Axel Ric
h
ard
Add
spl
i
t
S
m
a
l
l
UML case to performances tes
t
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-16
Ax
e
l
R
i
c
h
ard
Deactiva
t
e Large UML Model for Matc
h
Co
n
tent perfo
r
mances
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-16
Axel Richard
Improve dis
p
ose method for pe
r
fo
r
mances test
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-15
A
xel Richard
Activate Large UML
Mode
l
fo
r
performance
s
te
s
ts
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-18
Axel Richard
Updat
e
developer g
u
i
de
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-17
A
x
el
Richard
U
p
d
at
e
target platform to
Mars M4
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-17
Axel Rich
a
rd
S
i
mplific
a
tion of DependencyData
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-17
Axel Richard
[447231] Dif
f
er
e
nceGroup: don't
b
uild a sub t
r
ee
i
f
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-16
A
x
el
R
ichard
[
UI Tests] Update UI Te
s
t
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-16
A
xel Richar
d
N
o
t
i
fy resources w
h
en running me
r
ge all non conflicting
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-16
Axel Richa
r
d
[L
o
gical Mode
l
V
i
ew
]
Use our own s
y
nced icon
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-16
Axel Richard
[UI Tests
]
Upda
t
e UI Tes
t
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-12
Axel Richard
[U
I
Tests
]
Update UI
T
e
st
commit
|
commitdiff
|
tree
2014-12-12
Ax
e
l Ric
h
ar
d
[45
4
7
3
5] Ex
p
a
ndCo
l
l
apseL
i
s
t
ener raise
s
potential NP
E
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-12
Axel
Richard
Fix
U
nd
o
for
C
o
ntentMergeViewers
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-12
Axel
Rich
a
rd
F
i
x ran
d
om ord
e
r of Resou
r
cesAttachmentChanges i
n
SMV
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-11
Axel Richa
r
d
[UI T
e
sts] U
p
date UI
t
ests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-11
A
x
e
l
Richard
Re
s
ourcesAttachmentChan
g
e
s
must be f
i
ltered in gro
u
ps
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-11
Axel R
i
char
d
Don't clean eventbu
s
in c
o
mpare conf
i
guration
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-11
A
x
el R
i
c
hard
Do
n
't dis
p
ose differenceGr
o
upProvider in
E
MFCCC
o
n
tentMergeViewe
r
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-11
Ax
e
l
Rich
a
rd
Fix MergeAll Toolbar Action
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
A
x
e
l
R
ICH
A
RD
Merge "R
e
move
use
l
ess comparison field
"
commit
|
commitdiff
|
tree
2014-12-09
Axel
R
ichard
[UI Tests]
R
evert upgrades
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Axe
l
Richard
Update q7 te
s
ts
commit
|
commitdiff
|
tree
2014-12-09
A
x
e
l Ri
c
hard
[UI Tests] Fix
N
oClassDef
F
ound: or
g
/
sonatype/aether
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
A
xel
R
ichard
[UI Tests] Update pom
.
xml &
cr
e
ateAUT
.
sh
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-07
Axel Richard
[
4
53432]
A
dd f
i
r
st use
b
u
g to the known lim
i
tations
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-05
Axel Richar
d
[
442898]
A
dd con
f
lict: content merge viewer displays
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-05
Axel Richard
[EMF Com
p
ar
e
CLI] Add git
l
ogicalp
u
ll sectio
n
i
n d
o
c
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-04
Axel Richard
[
4428
9
7
]
Ps
e
u
do
c
onflicts und
e
r
Real
A
dd confli
c
ts
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-24
Axel R
i
chard
Add new Logic
a
l
Mo
d
e
l
View section in Use
r
guide
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-24
Axel Richard
Logic
a
l Model View:
new U
I
test cas
e
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-24
Axe
l
Richard
Logi
c
a
l Model View: reco
m
putes af
t
er reso
l
ution sc
o
p
e
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-19
Axel
R
i
c
h
ard
Logical Mo
d
el View: h
a
n
dle mod
e
ls
with e
r
rors
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-19
Axel Richard
Populate Logical
M
od
e
l V
i
ew when syn
c
hro
n
i
z
ation butto
n
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-07
Axel Richard
[449162] Fix
Il
l
e
g
alStateExcept
i
o
n: Th
e
re
s
ource
s
et
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-05
Axel Ri
c
hard
Add new Git commands invo
l
ving model
s
pa
g
e
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-05
Axel Richa
r
d
Add UI
tes
t
fo
r
Logical
Model View
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
next