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
[461504] Removes line-breaks in UI from attribute change values
2015-03-12
Philip Langer
[4
6
1504] R
e
moves l
i
ne-breaks in U
I
from
attribut
e
c
h
a
n
ge
.
.
.
commit
|
commitdiff
|
tree
2015-03-09
Stef
a
n Dirix
[457652] Give xmi:i
d
s
high
e
r
priority th
a
n att
r
i
bute id
s
commit
|
commitdiff
|
tree
2015-03-09
Stefan Dirix
[461
2
91] Avoid matching proxies with a
c
tual
o
bjects in
commit
|
commitdiff
|
tree
2015-03-04
Axel Richard
Performances
t
e
s
ts:
inc
r
ease ma
x
memo
r
y & max perm
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-02
Axe
l
Rich
a
rd
[458968]
F
ix
Rejecting
D
i
agr
a
mChange causes
NPE
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-02
Axel Ri
c
hard
F
ix
c
ore fe
a
tur
e
n
ame
to
be
co
n
s
istent with ot
h
er fe
a
tures
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-02
Axel Richard
[413038] Fix
Pro
p
erties View: edit a value chang
e
s
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-02
P
h
ilip Lang
e
r
[
45
8
1
4
7]
A
ppl
y
three-way
m
erg
i
ng also
fo
r
r
e
je
c
t
i
n
g
.
.
.
commit
|
commitdiff
|
tree
2015-03-02
Stefan D
i
rix
[461011] Allow customiza
t
ion of
pa
r
ent determination
.
.
.
commit
|
commitdiff
|
tree
2015-03-02
Philip Langer
[460778] Improves duplicate
ID war
n
in
g
in
Identifier
E
O
bject
M
.
.
.
commit
|
commitdiff
|
tree
2015-03-02
St
e
fan Dirix
[460675]
F
ix differe
n
c
e
s for noncontained FeatureMapEntries
.
.
.
commit
|
commitdiff
|
tree
2015-03-02
Stefan Dirix
[
460923] Do not filte
r
FeatureMapChanges on remo
v
ed
.
.
.
commit
|
commitdiff
|
tree
2015-03-02
Stef
a
n
D
irix
[460902] Fix Depen
d
en
c
y
C
a
lculatio
n
f
o
r
Fea
t
ureMap
.
.
.
commit
|
commitdiff
|
tree
2015-02-27
Philip L
a
nger
[457
8
3
9
]
Adds model update
s
t
r
ategy
for opaque element
.
.
.
commit
|
commitdiff
|
tree
2015-02-27
Philip Langer
[
45783
9
] Introduces model
u
p
date strategies
f
or c
o
n
t
e
nt
.
.
.
commit
|
commitdiff
|
tree
2015-02-26
Axel Richard
[4
3
4621] RootIDMatchingStrateg
y
matches i
n
c
orrectly
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-24
Lau
r
ent
Delaigue
[458818
]
N
PE
when confli
c
t
on multi-va
l
ued attrib
.
.
.
.
commit
|
commitdiff
|
tree
2015-02-11
Axel Richar
d
[U
I
Tests] Update q7 test
s
c
onfig
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
Laur
e
nt Dela
i
gue
[458802
]
NPE
when
ICompar
i
sonSco
p
e co
m
putes
empty
comparison
.
commit
|
commitdiff
|
tree
2015-02-09
Axel Richard
[
U
I
] Upda
t
e q7 tes
t
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
Ax
e
l Richard
Update Q7 A
U
T
f
or Mars M
5
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-27
Axel Ric
h
ard
Add large
split git uml
models to
p
erform
a
nces t
e
sts
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-27
A
xel
Richard
Improves
g
it
p
erfo
r
mances t
e
s
t
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-27
Axel Richard
Add nominal split git uml models to perf
o
rmanc
e
s te
s
ts
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-26
Axel Richard
Fix gi
t
performances tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-26
A
xel Richard
Fix perf
o
rmances tes
t
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-26
A
xel Richard
Add small split uml
m
odels to
g
it per
f
o
r
m
ances tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-26
A
x
e
l Richard
Allow to load resour
c
es in
N
o
t
L
o
a
d
i
ngResour
c
eSet after
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-26
Ax
e
l R
i
chard
Deactiva
t
e Ma
t
ch c
o
ntent tests for git
s
uite in performances
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-24
Axel Richard
Fix performance larg
e
git profile
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
Axel R
i
c
h
ard
A
d
d
n
ew pr
o
file
:
performanc
e
la
r
g
e g
i
t
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
Axel
Richard
Add
large um
l
siz
e
git p
e
rformances tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
Axel Richard
Ad
d
l
arge sp
l
i
t
uml models to
p
e
rformance
s
tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
Axel Richa
r
d
Revert "Fix
csv
files fo
r
p
e
rf
o
rmances tests (di
r
t
y
.
.
.
commit
|
commitdiff
|
tree
2015-01-23
A
xe
l
Richard
Fix csv files for performances tests (dirty
t
emp
o
r
ary
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
Axel
Ri
c
hard
Remove
C
losi
n
g
Welcome Page ste
p
f
rom git
p
erfor
m
an
c
e
s
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-23
Axel R
i
c
h
ard
Ad
d
small
&
nomin
a
l size git p
e
rformances tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-21
Axel Richard
[UI] Update tests for Collaborative M
o
deling bund
l
e
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-21
Laure
n
t Gou
b
e
t
This
parser prope
r
ty is not used by the java impleme
n
t
ation
commit
|
commitdiff
|
tree
2015-01-21
Philip L
a
nger
[4556
7
7] [UI Tests
]
Ad
d
s UI tests for opaque eleme
n
t
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-21
Alexand
r
a
B
uzil
a
[4
5
7117
]
Race
condition on save
commit
|
commitdiff
|
tree
2015-01-21
Philip Langer
[456535] Ad
d
s
U
I te
s
t f
o
r
model-based merg
e
from EGit
.
.
.
commit
|
commitdiff
|
tree
2015-01-21
Philip
L
anger
[456860] Improve han
d
ling of equivalent thr
e
e-w
a
y text
.
.
.
commit
|
commitdiff
|
tree
2015-01-20
Axel Ric
h
a
r
d
Add
L
arge UML
m
o
d
els
to performances
tests in a separate
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-20
Axel Richard
Revert "DRAFT - Intermediat
e
Proxies Resolution"
commit
|
commitdiff
|
tree
2015-01-20
A
x
e
l
Richard
DRAFT
-
In
t
er
m
ediat
e
Prox
i
es Resolu
t
ion
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-20
Axel
Richard
F
i
x input for
L
ogicalModel nominal case
of performances
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-20
Axel Richard
Add split Nomin
a
l UML case
to perf
o
rmances
tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-19
Axel Richard
D
elete FixCSV file (r
e
vert last commit)
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-19
Ax
e
l Richard
Fix csv
files of performance
s
tests (tempora
r
y
commit)
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-19
Axel Richard
Deactiv
a
te Lar
g
e
U
M
L
Models for performance
s
tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-16
Axel Richar
d
A
d
d s
p
l
it Smal
l
UM
L
case
t
o performances tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-16
A
xel Ric
h
ard
Deactivate La
r
ge UML Model for Match Content performances
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-16
Axel
Ric
h
ard
Improve d
i
spose m
e
thod
f
or
p
e
rformances tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-15
Axel
Richar
d
Activate Large UML Model for pe
r
formances tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
Philip Langer
[455677] Fixes inser
t
ion inde
x
of opaque elem
e
nt
body
.
.
.
commit
|
commitdiff
|
tree
2014-12-19
P
hil
i
p Langer
[451365] Adds s
p
ec
i
f
ic accessors for OpaqueElementBodyChanges
commit
|
commitdiff
|
tree
2014-12-19
Phi
l
i
p
Langer
[45
1
365] Removes con
f
licts and implications of
r
e
f
ining
.
.
.
commit
|
commitdiff
|
tree
2014-12-19
Laurent
Goubet
Use
d
e
man
d
C
r
eate
i
nstead of
explicitly cre
a
ting the
.
.
.
commit
|
commitdiff
|
tree
2014-12-19
L
a
urent Goube
t
Only care
for containm
e
nt proxi
e
s
w
hen reso
l
ving the
.
.
.
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goubet
Don't u
n
load resourc
e
s, e
v
en for
U
M
L
.
J
ust cl
e
ar out
.
.
.
commit
|
commitdiff
|
tree
2014-12-19
Laurent
G
oubet
Make
s
u
r
e th
e
factories are not kept around
as singleton
.
.
.
commit
|
commitdiff
|
tree
2014-12-19
Lau
r
ent Goubet
L
i
s
ten to the correct extension p
o
int for
t
he adapter
.
.
.
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goubet
Cl
e
ar all adapters
f
rom the comparis
o
n w
h
en we're d
o
ne
.
.
.
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goubet
Pr
o
per
l
y releas
e
the contributions w
e
do to the tool
.
.
.
commit
|
commitdiff
|
tree
2014-12-19
La
u
ren
t
Goub
e
t
Never u
s
e DISAB
L
E_NOTI
F
Y and DEFER_
A
TTACHMENT load
.
.
.
commit
|
commitdiff
|
tree
2014-12-19
L
a
urent Goube
t
P
r
op
e
rly null out the
references we've set
o
n
t
he p
r
ope
r
ties
.
.
.
commit
|
commitdiff
|
tree
2014-12-19
Lau
r
en
t
Goubet
Pull up
the removal
o
f
t
he team copy a
c
tions
f
rom the
.
.
.
commit
|
commitdiff
|
tree
2014-12-17
Axel
R
ichard
Update targe
t
platform to Mars M4
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-17
Stefan Dirix
[
453218] Add missing Fe
a
t
ureMap
C
hang
e
s concerning Moves
commit
|
commitdiff
|
tree
2014-12-16
St
e
fan Diri
x
[455255] Fix dete
r
mination o
f
T
arget
F
e
a
ture in Dif
f
U
ti
l
commit
|
commitdiff
|
tree
2014-12-16
Axel Ric
h
ard
[
U
I Te
s
ts
]
Updat
e
UI
T
est
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-16
St
e
fan Dirix
[454579] Fi
x
Nullpointer whe
n
element is
mo
v
ed
ou
t
.
.
.
commit
|
commitdiff
|
tree
2014-12-16
Axel
R
ic
h
ard
[UI
Test
s
]
U
pdate UI T
e
sts
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-12
Axel Richard
[UI
T
ests
]
Update UI
Test
commit
|
commitdiff
|
tree
2014-12-11
Axel
Ri
c
hard
[UI Tes
t
s] Update UI tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-11
La
u
rent Goub
e
t
Do
n
ot cr
e
ate al
l
TreeI
t
ems of the structure vie
w
er
.
.
.
commit
|
commitdiff
|
tree
2014-12-11
Axel Ri
c
h
a
rd
Don't dispose
d
ifference
G
roupPr
o
vid
e
r in EMFCCContentMerge
V
iewer
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-11
Lauren
t
Gou
b
et
platform plu
g
in and http shoul
d
never
b
e
ad
d
ed t
o
the
.
.
.
commit
|
commitdiff
|
tree
2014-12-10
Laurent Goub
e
t
Remove the adapters w
e
crea
t
ed fr
o
m the
c
omparison
.
.
.
commit
|
commitdiff
|
tree
2014-12-09
Laurent G
o
ubet
C
leanup c
o
m
p
are configurati
o
n
commit
|
commitdiff
|
tree
2014-12-09
Laurent Gou
b
e
t
S
tyle - false is the default
v
a
l
ue for bo
o
leans
commit
|
commitdiff
|
tree
2014-12-09
La
u
r
ent Goubet
_a
l
l_ listeners a
r
e int
e
rested in _all_ fetching notifications
commit
|
commitdiff
|
tree
2014-12-09
Laurent Goube
t
Don't keep the emp
t
y
group
p
rovider
aro
u
nd
commit
|
commitdiff
|
tree
2014-12-09
Laurent
G
oub
e
t
Rem
o
ve us
e
les
s
co
m
pari
s
on field
commit
|
commitdiff
|
tree
2014-12-09
A
xe
l
Richard
[UI Tests] Revert upgrade
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Axel Richar
d
U
p
d
a
te q7 t
e
sts
commit
|
commitdiff
|
tree
2014-12-09
Axel Richard
[UI Tests] Update pom
.
xml &
c
reat
e
A
U
T
.
sh
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-07
Axe
l
Richar
d
[
453432] Add first use bug to
t
he known limitati
o
ns
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-07
Philip Langer
[4
5
1365] Adds s
p
ecific handling of opaque action, behavio
r
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
A
xel Richar
d
[442898] Add con
f
li
c
t
: content mer
g
e v
i
ewer displa
y
s
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-05
Ax
e
l
R
ichard
[EMF Compare
C
LI] Add gi
t
logi
c
alpull section in doc
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-03
Ce
d
ric Notot
[4
5
3214] Spe
c
ify ancho
r
in the
d
o
c gene
r
ation
commit
|
commitdiff
|
tree
2014-12-03
St
e
f
a
n Dirix
[453749] Fix Nu
l
l
P
o
i
n
ter whe
n
handling Non-Containme
n
t
.
.
.
commit
|
commitdiff
|
tree
2014-12-03
Arthur Daussy
[
EMF Compare CLI
]
Documentation of t
h
e '
l
ogicalr
e
base
.
.
.
commit
|
commitdiff
|
tree
2014-12-01
Ar
t
hur Dau
s
sy
[EM
F
C
o
mpage CLI] Adds
a
"Known
issues
"
se
c
tion
.
commit
|
commitdiff
|
tree
2014-11-18
Stefan Dirix
[441172] Extend findM
a
sterEqui
v
ale
n
ce to not only ch
e
ck
.
.
.
commit
|
commitdiff
|
tree
2014-11-17
Laurent Goub
e
t
The Con
f
lictM
e
r
g
er ranking should
b
e above
that of
.
.
.
commit
|
commitdiff
|
tree
2014-11-17
Stefan
Dirix
[
45094
9
] Avoid shortcuts in DefaultDiffEngine for cert
a
in
.
.
.
commit
|
commitdiff
|
tree
2014-11-07
Laurent Go
u
bet
Various API
issues
commit
|
commitdiff
|
tree
next