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
Add small split uml models to git performances tests
2015-01-26
Ax
e
l Richard
Add small
spl
i
t
uml m
o
de
l
s to
git performances
tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-26
Axel
R
ichard
A
l
l
ow to
load
r
e
sources
i
n NotLoadingResour
c
eSet after
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-26
Axel
R
ich
a
rd
D
eactivate Match co
n
te
n
t test
s
fo
r
git sui
t
e in p
e
rformances
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-24
Axel Ri
c
hard
Fix pe
r
forman
c
e
l
arge git profile
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
A
xel
R
ichard
Ad
d
new p
r
ofile
:
perfo
r
ma
n
ce la
r
g
e git
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
A
x
el Richard
Add
l
arge uml siz
e
gi
t
perfo
r
manc
e
s tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
Axel Richard
Add large split uml mo
d
els to performances te
s
ts
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
Axel
R
ichard
R
e
v
ert "Fix csv files for performances
t
ests (
d
irty
.
.
.
commit
|
commitdiff
|
tree
2015-01-23
Axel R
i
chard
Fix csv file
s
for performance
s
t
e
sts (dirty temporary
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
Axel
Richa
r
d
Remov
e
Closing
Welc
o
me Page ste
p
from git
performances
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
Axel Richar
d
Add small & nominal siz
e
git performances tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-21
Axel Richard
[UI] Upda
t
e tests for
C
ol
l
aborat
i
ve Mo
d
eling bundle
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-21
La
u
rent Goubet
This parser pr
o
perty is not used by the java implementation
commit
|
commitdiff
|
tree
2015-01-21
Philip Langer
[455677] [UI Tes
t
s] A
d
d
s
U
I
test
s
for
o
paque
e
lement
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-21
A
lexandra Buzila
[
4
57117] Race condition
o
n
sav
e
commit
|
commitdiff
|
tree
2015-01-21
Phil
i
p
Langer
[456535] A
d
ds U
I
test for mo
d
el-b
a
s
e
d
m
erge
f
rom EGit
.
.
.
commit
|
commitdiff
|
tree
2015-01-21
Philip Langer
[456860] Imp
r
ove handling o
f
equi
v
alent thr
e
e-way
text
.
.
.
commit
|
commitdiff
|
tree
2015-01-20
A
xel
R
icha
r
d
Ad
d
Larg
e
UML mod
e
ls to p
e
r
formanc
e
s tests in a
separate
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-20
A
x
el Richard
Revert "DR
A
FT
-
Intermediate P
r
oxies Resolu
t
ion
"
commit
|
commitdiff
|
tree
2015-01-20
Axel Richard
DRAFT - Int
e
rmediate
Proxi
e
s
Resolution
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-20
Axel Richar
d
Fix
input for LogicalModel nominal case of pe
r
f
o
rman
c
es
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-20
Axel R
i
chard
Add split
Nominal UML case to pe
r
f
o
r
m
ances
t
ests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-19
Axel Richar
d
De
l
e
t
e
FixCSV file (revert
l
ast
com
m
it)
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-19
Axel Richard
Fix csv files of performances
tests (t
e
mporary commit)
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-19
Axel Ri
c
h
a
rd
Deactivate L
a
rge UML
M
o
dels for performances
tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-16
A
xel Richa
r
d
Add split S
m
all
U
M
L
case t
o
p
e
rformances tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-16
Axel Richard
Deact
i
vate Large UM
L
M
o
del f
o
r Ma
t
ch Content p
e
rfo
r
m
a
nces
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-16
Axel Richa
r
d
Improve dispose
m
et
h
od
f
or performances tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-15
Axe
l
Richard
Activa
t
e Large UML
M
o
del for pe
r
form
a
nces test
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
P
h
ilip Lang
e
r
[45
5
6
7
7]
Fixes inser
t
ion in
d
e
x
of opaque elemen
t
b
o
dy
.
.
.
commit
|
commitdiff
|
tree
2014-12-19
P
hilip Langer
[
451365]
Ad
d
s sp
e
cific accesso
r
s for OpaqueElementBodyChanges
commit
|
commitdiff
|
tree
2014-12-19
Philip Langer
[
451365] Removes conflicts and i
m
plic
a
tions o
f
refining
.
.
.
commit
|
commitdiff
|
tree
2014-12-19
Laurent
Gou
b
e
t
U
se demandCreate instead of explicitly crea
t
ing th
e
.
.
.
commit
|
commitdiff
|
tree
2014-12-19
L
aurent G
o
ubet
O
nly care for contai
n
m
ent proxies whe
n
r
e
solving the
.
.
.
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goubet
Don't unload resource
s
, eve
n
for UML
.
Ju
s
t clear
o
u
t
.
.
.
commit
|
commitdiff
|
tree
2014-12-19
La
u
rent Go
u
b
e
t
Make
s
ure
t
h
e
factorie
s
are not ke
p
t
arou
n
d as singleton
.
.
.
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goube
t
Listen to
the correct ext
e
nsi
o
n
p
o
int
f
o
r the
a
dapter
.
.
.
commit
|
commitdiff
|
tree
2014-12-19
L
a
urent Goub
e
t
Cl
e
ar al
l
a
dapters from the
c
omparison
w
h
en w
e
're done
.
.
.
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goubet
Proper
l
y
r
elea
s
e the contributions we do to the tool
.
.
.
commit
|
commitdiff
|
tree
2014-12-19
Lau
r
ent Goubet
Never use D
I
S
AB
L
E_NOTIFY and DEF
E
R
_ATTACHMENT load
.
.
.
commit
|
commitdiff
|
tree
2014-12-19
L
a
urent Goubet
Properly null out th
e
referen
c
es we've set on the properties
.
.
.
commit
|
commitdiff
|
tree
2014-12-19
La
u
rent Goubet
P
u
ll
u
p the remova
l
o
f the
team
copy actions from the
.
.
.
commit
|
commitdiff
|
tree
2014-12-17
Axel
R
ichard
Up
d
ate
t
arget
platform to
M
a
rs M4
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-17
Stefan
D
irix
[
453218] Add missing
Feature
M
apChanges conc
e
r
n
in
g
Moves
commit
|
commitdiff
|
tree
2014-12-16
Ste
f
an Dirix
[45525
5
] Fix
d
etermination of T
a
rge
t
Feature in
DiffU
t
il
commit
|
commitdiff
|
tree
2014-12-16
Axe
l
R
ichard
[UI
Tests] Update UI
Test
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-16
Stefan Dirix
[454579] Fix Null
p
oint
e
r
when element is
moved out
.
.
.
commit
|
commitdiff
|
tree
2014-12-16
Axel R
i
chard
[
U
I
T
e
sts] Update UI Tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-12
Axel Richard
[U
I
Tests
]
Update UI Test
commit
|
commitdiff
|
tree
2014-12-11
Axel Richard
[UI Tests
]
Update UI tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-11
Laur
e
nt Goube
t
Do not create al
l
TreeIte
m
s of the structure viewer
.
.
.
commit
|
commitdiff
|
tree
2014-12-11
Axel Richa
r
d
Don't dispose differenceGro
u
pProvider i
n
EMF
C
C
C
o
n
ten
t
M
e
rgeViewer
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-11
Laurent Gou
b
e
t
pla
t
f
orm pl
u
gin and http should never be added
t
o the
.
.
.
commit
|
commitdiff
|
tree
2014-12-10
Laurent Goubet
Remove the adapters
w
e created from the
c
om
p
ariso
n
.
.
.
commit
|
commitdiff
|
tree
2014-12-09
Laurent Goubet
Clean
u
p compare co
n
figuration
commit
|
commitdiff
|
tree
2014-12-09
La
u
rent Goubet
Style - false is
the default value for bool
e
ans
commit
|
commitdiff
|
tree
2014-12-09
L
a
ur
e
nt
G
o
u
be
t
_
a
ll_ listeners are interested i
n
_all_ fetching notificati
o
ns
commit
|
commitdiff
|
tree
2014-12-09
Laurent G
o
ubet
Don'
t
k
e
e
p
the em
p
ty group provid
e
r around
commit
|
commitdiff
|
tree
2014-12-09
Laurent Goubet
Remove useless compariso
n
field
commit
|
commitdiff
|
tree
2014-12-09
Ax
e
l
Ri
c
h
a
r
d
[UI Tests] Revert upgrades
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Axel Richa
r
d
Update q7 test
s
commit
|
commitdiff
|
tree
2014-12-09
Axel Richa
r
d
[UI Tests] Update p
o
m
.
xml &
c
reateAUT
.
sh
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-07
Axel Richar
d
[4534
3
2] Add f
i
r
st
use b
u
g to the kno
w
n l
i
mitations
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-07
Philip
L
an
g
er
[451365] Adds sp
e
cific handling of opaque a
c
tion, behavior
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Axel Richard
[442
8
98]
A
dd co
n
flic
t
: content
merge viewer displ
a
ys
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-05
Axe
l
Rich
a
r
d
[EMF
C
ompare CLI] Add git logical
p
ull
section in doc
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-03
Cedric Not
o
t
[453214] Sp
e
c
i
fy
anchor i
n
th
e
doc ge
n
erat
i
on
commit
|
commitdiff
|
tree
2014-12-03
S
t
efa
n
Dirix
[453749] Fix
N
ullPo
i
nte
r
when handling Non-Contai
n
ment
.
.
.
commit
|
commitdiff
|
tree
2014-12-03
Arth
u
r Daussy
[E
M
F
Compare CLI]
D
ocumentation of the 'logicalrebase
.
.
.
commit
|
commitdiff
|
tree
2014-12-01
Arthur Daussy
[EMF Compa
g
e CLI] Adds a "Known i
s
sues" sect
i
on
.
commit
|
commitdiff
|
tree
2014-11-18
Ste
f
an Dirix
[
4
4
1172]
E
x
tend findMasterEquiv
a
lence to not only
check
.
.
.
commit
|
commitdiff
|
tree
2014-11-17
Laure
n
t Goubet
The ConflictMerger
ranking
s
hould be above th
a
t
of
.
.
.
commit
|
commitdiff
|
tree
2014-11-17
Stefan
Di
r
ix
[450
9
49] Avoid shortcuts
i
n De
f
a
u
l
t
Di
f
fEngine fo
r
cert
a
i
n
.
.
.
commit
|
commitdiff
|
tree
2014-11-07
Laurent
G
oubet
Various API
issues
commit
|
commitdiff
|
tree
2014-11-07
Laurent Goubet
Fix t
h
e "c
o
py all
n
on-conf
l
icting" ac
t
ions
commit
|
commitdiff
|
tree
2014-11-05
Arthur Daussy
U
I
tes
t
s:
Update differences
o
rder
commit
|
commitdiff
|
tree
2014-11-05
Arthur Daussy
UI tests:
Update
e
dito
r
labe
l
after modification in
.
.
.
commit
|
commitdiff
|
tree
2014-11-03
Arthu
r
D
a
ussy
Confi
g
ures Q
7
tests
t
o run on Mars platform
commit
|
commitdiff
|
tree
2014-10-08
Axe
l
Richa
r
d
[439036] Feat
u
reMap filter s
h
ould
n
't hide diffs with
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-10-02
A
x
el Ric
h
ard
Bumpi
n
g minor for all p
l
ugins/fea
t
u
r
es changed
sinc
e
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-25
A
xel Ri
c
hard
[442887] Pr
o
tect co
m
p
ar
e
a
c
ti
o
ns fr
o
m
over-enthusiast
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-19
Axel
R
ichard
[44
4
351] F
i
x
bug
in E
q
ualityH
e
lper
.
matchi
n
g
A
r
rays
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-17
Alexandra
Buzila
Fix
e
d typos in the Tutorial,
Developer
guide, Logical
.
.
.
commit
|
commitdiff
|
tree
2014-09-15
Arth
u
r Daussy
[
441089] Na
g
ivation between difference
s
now uses an
.
.
.
commit
|
commitdiff
|
tree
2014-09-15
A
r
t
hur Dau
s
sy
[44333
0
] Load
UM
L
static
p
r
o
file using path map
commit
|
commitdiff
|
tree
2014-09-15
Ar
t
h
u
r
Daussy
[443330] Avoid getting a "Pro
f
ile vers
i
on chang
e
"
error
.
commit
|
commitdiff
|
tree
2014-09-15
Arthur
Daussy
[443330] Imp
r
oves URI handl
i
ng
.
commit
|
commitdiff
|
tree
2014-07-03
Axel Richard
Feature
M
aps: Add ne
w
Diff: F
e
atur
e
MapChange
commit
|
commitdiff
|
tree
2014-06-26
Arthur Daussy
Reg
e
ne
r
ates
EMF Compare static test pr
o
file
.
commit
|
commitdiff
|
tree
2014-06-26
Arthur
Dau
s
s
y
Adds UMLStereoty
p
e
d
Ele
m
entChange
p
ost p
r
ocessor
.
commit
|
commitdiff
|
tree
2014-06-20
Lau
r
ent Goubet
avoid fa
i
lures com
p
ar
i
ng files
a
t
rep
o
sit
o
ry root
commit
|
commitdiff
|
tree
2014-06-20
Axel Richard
EMF Compar
e
doc: Add tutori
a
l
to in
d
ex
commit
|
commitdiff
|
tree
2014-06-20
Arthur
D
a
ussy
EMF
Compare tutorial: Tutorial part 1
commit
|
commitdiff
|
tree
2014-06-20
Arthur Da
u
ssy
EMF
C
ompa
r
e tutorial: EXTlibrar
y
plu
g
ins
commit
|
commitdiff
|
tree
2014-06-03
Axel Richar
d
[435251] [4
3
5
252] Up
d
ate doc
f
or Luna
commit
|
commitdiff
|
tree
2014-05-28
Ax
e
l Richard
[434828] Test M
e
r
g
e Confli
c
t Diff With
C
o
nflictin
g
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Arthur Dauss
y
[434828] Test M
e
rge Conflict D
i
ff With Conflicting
.
.
.
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-28
Arth
u
r
Daussy
[43482
2
] Confl
i
ct between move and delete
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-27
A
x
el Richard
[435
7
43] Fix Diag
r
a
m
s nod
e
a
r
e
n
ot disp
l
ayed anymore
.
.
.
commit
|
commitdiff
|
tree
2014-05-26
A
xel
Richard
[
4
3
5
617] Fi
x
Structur
e
Merge Viewer con
t
ent
wit
h
r
e
fined
.
.
.
commit
|
commitdiff
|
tree
next