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
Make sure folders are created when extracting input files
2015-04-14
Axel Rich
a
rd
[464
3
79]
Matching
resources
shoul
d
use id strateg
y
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-13
Ax
e
l Rich
a
r
d
Remove fuzzy from all target p
l
atfo
r
ms
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-07
Ax
e
l Ric
h
ard
[463445] Fix
po
t
ential NPE in EMFCompar
e
Structure
M
erg
e
Vi
e
w
e
r
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-07
Ax
e
l Richard
[46255
0
] Fix re
s
ource
S
etHoo
k
exte
n
sio
n
-
p
ont ID
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-01
Axel Richar
d
[442265]
[
4
60
7
82] Av
o
id
Infinite "please wait" view
e
r
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-30
Axe
l
Richa
r
d
[
U
I Tests] Upda
t
e A
U
Ts
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-30
Axel Rich
a
rd
[UI Test
s
] Upda
t
e
AUTs
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-26
Axel Richard
[
4
42
2
6
5
][46
0
782] Avoi
d
I
nf
i
n
ite "please wait" view
e
r
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-24
Axe
l
Richa
r
d
[461986] [UI] Tests
- Int
e
rmediate
P
rox
i
es
Resolution
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-24
A
x
el Ric
h
ard
[461986]
Fix bug in
I
nt
e
rmedia
t
e Proxies Resolu
t
ion
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-17
A
x
e
l
Ri
c
hard
[461224] Fix N
o
SuchElemen
t
Excepti
o
n in Gra
p
h
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-17
Ax
e
l Ric
h
ard
[
4
6
1
986] Tests - Intermed
i
ate Pr
o
xies
R
esolution
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-17
Axel Richa
r
d
[461986] I
n
termedia
t
e Proxies Res
o
lution
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-17
Axel Ri
c
hard
[46
2
203] Child
match appear as
top-level match
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-13
Axel Richard
[442227] Co
m
pare an untracke
d
file with H
E
AD
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-04
Axel
R
icha
r
d
[458963] EMFCompa
r
e object doesn't use EM
F
Compar
e
RCP
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-04
A
x
el
R
i
c
h
a
r
d
Performances tes
t
s:
inc
r
ease max memory & max perm
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-02
Axel
R
ichard
[
4
58968
]
Fix Rejecti
n
g DiagramChan
g
e
causes N
P
E
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-02
Axel
R
i
char
d
Fix co
r
e feature name to be consistent with other
f
e
a
tures
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-02
Axel Richard
[41303
8
]
F
ix Pr
o
perties Vie
w
:
e
di
t
a valu
e
changes
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-26
Axel Richard
[434621] RootIDMatchingStrategy
matches incorrectly
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-11
Axel Ric
h
ard
[UI Tests] Upd
a
te q
7
tests con
f
ig
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
Axel Richard
[UI] Update
q7 tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
Axel Richa
r
d
[436050
]
Fi
x
copy a
l
l does nothing
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
Axel Richard
[45679
6
]
Cascading filter shou
l
d
n
't
h
ide move differences
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
A
x
el Richard
[413038] F
i
x
P
roperties View: edit a v
a
l
ue changes
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
Axel Richard
[45913
1
] Fi
x
Lo
g
i
cal Model Re
s
ou
r
ce
s
Gra
p
h update
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
A
x
el Richard
Up
d
ate
Q7 AUT for M
a
rs
M
5
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-27
Axel Richar
d
Add large
split git
u
ml models to
perfor
m
ances tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-27
Axel
Richard
Imp
r
oves
g
it perf
o
rmanc
e
s tes
t
s
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
p
erformances te
s
ts
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-26
Axel Ri
c
ha
r
d
Fix git per
f
ormances tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-26
A
xel Richard
Fix
performances te
s
t
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-26
Axel Richard
Add
s
mall
s
plit uml models to git
p
erforman
c
e
s test
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-26
Axel
R
i
chard
A
l
low to load resources
i
n NotLoa
d
ingRe
s
ourceSet after
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-26
Axel
R
i
chard
Deactivate Match
conten
t
tests for
git suite in p
e
rforma
n
ce
s
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-24
Axel Ric
h
ard
Fix perfor
m
ance large git pr
o
f
ile
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
Ax
e
l
Richard
Add
n
e
w profil
e
: performance large
git
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
Axel Richard
Add large
u
ml s
i
ze g
i
t perf
o
rmances test
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
Axel Richar
d
Add large s
p
l
i
t uml models to
p
erformances tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
Axel
R
ichard
R
e
vert "Fix csv files for performances tes
t
s (dirty
.
.
.
commit
|
commitdiff
|
tree
2015-01-23
Ax
e
l Rich
a
rd
Fix csv files for performances t
e
sts (dirt
y
t
em
p
orary
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
Axel Ri
c
hard
Rem
o
ve Closin
g
Wel
c
o
me
Page step from g
i
t
performances
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
Axel Ri
c
hard
Add small &
n
ominal size git per
f
ormances test
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-21
Axel Richa
r
d
[UI] Update tests for C
o
llab
o
ra
t
ive Model
i
ng bundle
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-20
Axel Richard
A
d
d Large UML m
o
d
e
ls t
o
performance
s
test
s
in a sep
a
r
a
te
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-20
A
xel Richard
Revert "D
R
AFT
-
Int
e
rmediate
P
r
o
xies Resoluti
o
n"
commit
|
commitdiff
|
tree
2015-01-20
Axel Richard
DRAFT - Interm
e
diate Proxies Re
s
olution
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-20
Axel Richard
Fix input
for Logical
M
odel nominal case o
f
performances
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-20
Axel Richar
d
Add
split N
o
minal
U
ML c
a
se to performances te
s
ts
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-19
Axel
R
ichard
Delete FixCSV fil
e
(
reve
r
t last
c
o
mmit)
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-19
A
x
e
l
Richard
Fix csv files of performances te
s
ts (temporary commit)
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-19
Axel Ric
h
ard
D
eactivate Larg
e
UML Models for p
e
rf
o
r
manc
e
s tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-16
Ax
e
l Richard
A
d
d sp
l
it Small
UML case to perfor
m
ances tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-16
Axe
l
Ri
c
hard
Dea
c
tivate Large UML
Mod
e
l for Mat
c
h C
o
nt
e
nt perform
a
nces
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-16
Axel Richard
Impro
v
e dis
p
o
se met
h
od for p
e
rformances tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-15
Axel R
i
chard
Ac
t
i
vate Large
U
ML Model
f
or p
e
r
f
ormanc
e
s tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-18
Axel Richard
Upda
t
e developer guide
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-17
Axel Richard
Update target platform to Mars M
4
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-17
Axel Richard
Simp
l
ificati
o
n of Depend
e
nc
y
Data
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-17
Axel R
i
c
hard
[447231] Differen
c
eGroup: don't
b
u
ild a sub tr
e
e if
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-16
Axel Richar
d
[UI Tes
t
s] Update
UI
T
est
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-16
Axel Richard
Notify resource
s
when run
n
ing merge all
n
on
c
onflicting
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-16
A
xel Richard
[Logic
a
l Model View] Use o
u
r own
s
ynced icon
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-16
A
x
el Rich
a
r
d
[UI Tests] Update UI
T
est
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-12
A
xe
l
Richard
[
U
I Tests
]
Update
U
I
Test
commit
|
commitdiff
|
tree
2014-12-12
Axel Rich
a
rd
[454735] Ex
p
an
d
Co
l
la
p
seListener raises potential N
P
E
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-12
A
xel Richar
d
Fix Und
o
for ContentMergeVi
e
wers
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-12
Axel Richard
Fix random or
d
er of
R
e
s
o
urcesAttachmentC
h
anges in
S
MV
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-11
Axel Richard
[UI Tests] Update
U
I tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-11
A
xel Ri
c
hard
Resour
c
esAttachmentChan
g
es must be filtered in groups
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-11
Axel Richa
r
d
Don't clean eventbus in compare configura
t
ion
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-11
A
xel Richard
Don't dispose dif
f
erenceGroupPr
o
vider in EMFCCContentM
e
rgeViewer
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-11
A
xel Rich
a
rd
Fix MergeA
l
l Toolbar Actions
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Ax
e
l RICHARD
Merge
"Remove
u
s
eless
c
omparison field
"
commit
|
commitdiff
|
tree
2014-12-09
Axel
R
ichard
[UI Tests] Rev
e
rt upgrades
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Axel Richard
Update q7 tests
commit
|
commitdiff
|
tree
2014-12-09
Axel Richard
[U
I
Tests] Fix NoCl
a
ssDefFound: org/so
n
atype/aether
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Axel Richard
[UI
T
es
t
s
]
Updat
e
pom
.
x
m
l & cre
a
teAUT
.
sh
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-07
A
x
e
l
Richard
[45
3
4
3
2] Add first use bug
to
the known li
m
itations
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-05
Axel Richar
d
[
442898] A
d
d conf
l
i
c
t: content
merge
viewer disp
l
ays
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-05
Axel Ric
h
ard
[EMF
C
o
m
p
are CLI] Add git logica
l
pull section in doc
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-04
A
xel R
i
char
d
[442897]
Pseudo co
n
flicts u
n
der Real Add con
f
licts
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-24
A
xel Richard
Add n
e
w Log
i
cal Mod
e
l
View section in
U
ser guide
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-24
Ax
e
l Ri
c
hard
Logical Model View: new UI
t
est cases
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-24
Axel Richard
Lo
g
i
c
al Model
V
iew: re
c
omputes
afte
r
resolu
t
ion s
c
o
p
e
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-19
Axel Ri
c
hard
Logical Model
V
iew: handle m
o
dels with
error
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-19
A
x
el Richar
d
Populat
e
Logic
a
l
Mo
d
e
l
Vie
w
w
hen
synchronizati
o
n
button
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-07
Axel Richard
[
449162] Fix I
l
le
g
al
S
tat
e
Exception:
T
he resource
s
et
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-05
Axel Richard
Add new Git command
s
invo
l
v
in
g
models page
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-05
A
xe
l
Richar
d
Add UI tes
t
for Logical
Mode
l
View
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-05
Axel Richard
New Logical Model View
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-05
Axel RI
C
HARD
Merge
"UI tests: Update differences ord
e
r"
commit
|
commitdiff
|
tree
2014-10-09
Axel Richard
[443695] Updat
e
C
o
n
f
l
i
c
t Icon & Label
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-10-08
Axel Richard
[439036] Fea
t
ureMap filter shouldn't hide d
i
ffs
w
ith
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-10-08
Axel Richa
r
d
Fix missing com
m
a in
build
.
properties of doc plugin
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-10-02
Axe
l
Richard
Bumping minor for all pl
u
gin
s
/
f
eatures changed s
i
nce
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-25
Axe
l
Richard
[4
4
2
8
87]
Pro
t
e
ct compare actions
f
rom over-en
t
husia
s
t
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-25
Axel Ri
c
h
a
r
d
[443031
]
Fix NPE on Fe
a
tu
r
e
F
ilter
.
reference
I
sS
e
t
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-25
Axel Richard
[4
4
3968] Fix
NPE in
Com
p
arisonUtils
.
getSubDiffs
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
next