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
Revert "DRAFT - Intermediate Proxies Resolution"
2015-01-20
A
xel Richard
R
evert "DRAFT - Inter
m
edi
a
t
e
Pro
x
ies Res
o
lut
i
on"
commit
|
commitdiff
|
tree
2015-01-20
Axel Ric
h
ard
DR
A
FT - Inte
r
mediate Pr
o
x
ie
s
Re
s
olution
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2015-01-20
A
x
el Richar
d
Fix
input for LogicalMo
d
el nomi
n
al case of perf
o
rmances
.
.
.
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2015-01-20
Axel
Richa
r
d
Add split
N
o
m
inal UM
L
case t
o
performa
n
ces tests
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2015-01-19
Axel Ri
c
h
ard
Del
e
te Fi
x
CS
V
file (rever
t
last c
o
mmi
t
)
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2015-01-19
Axe
l
Richard
Fix csv f
i
les of perfo
r
mances tests (temp
o
rar
y
commi
t
)
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2015-01-19
Axel Richard
Deactivate Lar
g
e UML M
o
d
e
ls
for performances te
s
ts
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2015-01-16
Axel Ri
c
ha
r
d
Add split Small UML
c
ase
to performances tests
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2015-01-16
Axel Richard
Deactivate Large
U
ML
Model for Match Content performances
.
.
.
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2015-01-16
A
x
el Rich
a
rd
Imp
r
ove di
s
pose
m
ethod for per
f
orma
n
ces te
s
t
s
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2015-01-15
Axel Ric
h
ard
Activ
a
te Lar
g
e UML M
o
del for perform
a
n
c
e
s
t
ests
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-18
Axel Richa
r
d
Update
developer guide
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-17
Ax
e
l
Richa
r
d
Update t
a
rget platf
o
rm t
o
Mars M4
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-17
Axel Richard
S
implifi
c
at
i
on
o
f DependencyDa
t
a
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-17
Axel Richard
[
4
47231]
D
i
ffer
e
nceGro
u
p: don't
build a sub
t
r
ee if
.
.
.
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-16
Ax
e
l R
i
chard
[UI Tes
t
s
]
U
p
d
ate U
I
Test
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-16
Axel Ri
c
hard
Notify r
e
sou
r
ces when runnin
g
merge a
l
l non conflict
i
ng
.
.
.
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-16
Axel Ri
c
hard
[
L
ogical Model View] Use our o
w
n synced icon
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-16
Axel
R
i
ch
a
r
d
[UI
T
ests
]
U
p
da
t
e UI Tests
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-12
Ax
e
l Richard
[UI Tests] Up
d
ate UI Test
commit
|
commitdiff
|
tree
2014-12-12
Axel Ric
h
ard
[
4
54735] Ex
p
andColl
a
pseListener raises potential NPE
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-12
Ax
e
l Richard
Fix Undo for ContentMergeVie
w
ers
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-12
Axel R
i
chard
Fix
r
a
n
dom order of Resour
c
esAttac
h
mentCha
n
ges in SMV
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-11
Axel Richard
[UI Tests] Update UI
t
e
sts
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-11
Axel Richard
Resou
r
cesAttachmentChange
s
must be filtered
i
n gro
u
p
s
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-11
A
x
el Richard
Don't cl
e
an eve
n
t
b
us in compare configuratio
n
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-11
Axel Rich
a
rd
Don't d
i
spose
differenceGroupP
r
ovid
e
r
in EMFCCCon
t
e
ntMer
g
eVie
w
e
r
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-11
Axel
Rich
a
rd
Fix
M
ergeAll Toolbar
Actions
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Axe
l
RICHARD
Merge "Remove useless comparis
o
n field"
commit
|
commitdiff
|
tree
2014-12-09
Axel Richard
[UI Test
s
] Rev
e
rt
u
pgrades
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Axe
l
Richard
Upd
a
t
e
q7 tests
commit
|
commitdiff
|
tree
2014-12-09
Axel R
i
cha
r
d
[U
I
Tests] Fix N
o
C
lassDefFound: or
g
/sona
t
ype/aether
.
.
.
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Axel Richard
[UI Tests
]
Update pom
.
xml
&
c
reat
e
AUT
.
sh
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-07
Axe
l
Richard
[4
5
3432] Add
first use b
u
g t
o
the k
n
own limitations
.
.
.
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-05
A
x
el Richar
d
[
4
42898] Add conf
l
ict: content
m
erge vie
w
er displays
.
.
.
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-05
Axel Rich
a
rd
[EMF Compare CLI] Add
gi
t
logicalpull section in doc
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-04
Axel
Richard
[442897] Pseudo
conflicts unde
r
Re
a
l
A
dd confl
i
cts
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-11-24
Axe
l
Richard
A
dd new Logical Mode
l
Vie
w
section in User guide
.
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-11-24
Axel Ri
c
har
d
Logical M
o
del View: new UI test
cases
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-11-24
Axel Richard
L
o
gical Mode
l
View: recomputes af
t
er r
e
so
l
ution s
c
ope
.
.
.
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-11-19
A
x
e
l Richard
Logical Model View: handl
e
models with err
o
rs
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-11-19
Axe
l
Richard
Populate
Logi
c
al Mode
l
View when sync
h
r
oniz
a
tion butt
o
n
.
.
.
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-11-07
Axel Richard
[449162]
Fix Illeg
a
lSta
t
e
E
x
ception: The resource se
t
.
.
.
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-11-05
Axel
Richard
Ad
d
n
e
w Git commands involving models pa
g
e
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-11-05
Axel R
i
chard
Add UI test
for Logi
c
al Model View
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-11-05
Ax
e
l Richard
Ne
w
Logical
Mod
e
l View
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-11-05
Axel RICHARD
Merge "UI
te
s
ts: Up
d
at
e
d
if
f
erences order"
commit
|
commitdiff
|
tree
2014-10-09
Axel Ric
h
a
r
d
[44369
5
] Update C
o
nflict Ico
n
&
Label
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-10-08
Axel Ric
h
ard
[
4
39036] Fea
t
u
reMap filter shou
l
dn't hide
diffs wi
t
h
.
.
.
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-10-08
Axel Richard
Fix missing comma in b
u
i
l
d
.
propertie
s
of doc plugin
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-10-02
Axe
l
Rich
a
r
d
Bumping
minor for all plugins/feat
u
res chan
g
ed since
.
.
.
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-09-25
Axel Ric
h
ard
[442887] Protect
c
o
mpa
r
e
actions f
r
o
m
over-en
t
husiast
.
.
.
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-09-25
Axel Richar
d
[
4
430
3
1]
F
ix NPE on Feat
u
reFilter
.
reference
I
sSe
t
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-09-25
Axel Richard
[443968] Fix NPE in ComparisonUtils
.
getSubDiffs
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-09-25
Axel Richard
[4
0
4
8
1
1] Expan
d
g
r
oup
i
tem on double-click
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-09-25
Axel Richa
r
d
[44
1
754] The
d
efault a
c
tivated group is built tw
i
ce
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-09-25
Axel Ric
h
ard
[4
4
36
9
6
]
Add contextual menu on dif
f
ere
n
ces in SMV
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-09-19
Axel Richar
d
[444351] Fix b
u
g in Equa
l
ity
H
e
l
per
.
matchingArr
a
ys
Signed-off-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-07-07
Axel Ric
h
ar
d
FeatureMaps:
F
eatureMapChanges tests
commit
|
commitdiff
|
tree
2014-07-07
Axel Richard
Add new UI filter: FeatureMa
p
entr
i
es
commit
|
commitdiff
|
tree
2014-07-07
A
x
el R
i
ch
a
rd
Add def
a
ult
m
ethods imp
l
e
m
entatio
n
i
n
AbstractDiffe
r
enceG
r
ou
.
.
.
commit
|
commitdiff
|
tree
2014-07-07
Axel Richard
Feat
u
r
e
Maps: Handl
e
Feat
u
r
e
M
apChange differ
e
n
ces
commit
|
commitdiff
|
tree
2014-07-03
Axel
R
ichard
FeatureMaps: Add new Diff: FeatureMapChange
commit
|
commitdiff
|
tree
2014-07-01
Axel Richa
r
d
[
43781
1
] Und
o
me
r
ge
changes the w
a
y of conse
q
uenc
e
s
.
.
.
commit
|
commitdiff
|
tree
2014-06-20
Axel RICH
A
RD
Merge "avoid
f
ailures comp
a
ring
f
ile
s
at
reposit
o
ry
.
.
.
commit
|
commitdiff
|
tree
2014-06-20
Axel Richa
r
d
EMF Compare
do
c
: Add
tutorial to index
commit
|
commitdiff
|
tree
2014-06-03
Axel
R
i
c
hard
[
4
3
52
5
1] [435
2
52] Up
d
at
e
doc for Lu
n
a
commit
|
commitdiff
|
tree
2014-05-28
Axel R
i
ch
a
rd
[434828] Test
M
erg
e
Confl
i
ct Diff
W
ith
C
onflicting
.
.
.
commit
|
commitdiff
|
tree
2014-05-27
Axel Richard
[435743] Fix Diagra
m
s node are
n
ot
d
is
p
layed a
n
ymor
e
.
.
.
commit
|
commitdiff
|
tree
2014-05-26
A
xel Richard
[435617
]
F
i
x Str
u
ct
u
re
M
er
g
e View
e
r con
t
ent with
refined
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Axel Richard
[
4
31882] Fix
I
llegalStateExce
p
t
i
o
n
in case of Pse
u
do
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Ax
e
l Ri
c
hard
[435053] Add
P
seudo c
o
nfl
i
cts tes
t
s
.
commit
|
commitdiff
|
tree
2014-05-21
Axel
R
ichard
[435376
]
Conflicted
sub
d
iffs shoul
d
n
't
b
e
merged when
.
.
.
commit
|
commitdiff
|
tree
2014-05-20
Axel Rich
a
r
d
[434866] Re
a
l Add Conflict Di
s
p
l
ay
commit
|
commitdiff
|
tree
2014-05-07
Axel Richard
[434200] Accept
/
Rejec
t
di
f
fe
r
ence fa
i
ls in s
o
me cases
commit
|
commitdiff
|
tree
2014-05-06
Axel
R
i
chard
[434165]
M
ark cons
e
q
u
ences a
s
merge
commit
|
commitdiff
|
tree
2014-05-06
A
x
el Richard
[
4
31643
]
Fix M
a
nage c
a
se of no
s
elected item
.
commit
|
commitdiff
|
tree
2014-05-05
Axel
Richard
[
431643] Fix Manage case o
f
no selecte
d
item
.
commit
|
commitdiff
|
tree
2014-05-05
A
x
e
l Richard
Add
pseudo conflict diffs to the requir
e
d
c
onsequences
.
.
.
commit
|
commitdiff
|
tree
2014-05-05
A
x
el Rich
a
rd
Disp
l
ay Dropdown m
e
rge menu ac
t
ions label
s
commit
|
commitdiff
|
tree
2014-04-28
Axel
Richard
[431643] Manage case of no selected item
.
commit
|
commitdiff
|
tree
2014-04-28
Axel
Ric
h
ard
[
43164
3
] Manage cases o
f
no differences and no visibl
e
.
.
.
commit
|
commitdiff
|
tree
2014-04-17
Axel R
i
ch
a
rd
Add equ
i
valen
c
es
to the required consequences show
n
.
.
.
commit
|
commitdiff
|
tree
2014-04-09
Axel Richard
norm
a
l
ize
E
O
Ls in
t
h
e
core (th
i
rd pa
s
s)
commit
|
commitdiff
|
tree
2014-04-09
A
xel Richard
[432014] To
o
lbar
appears twice aft
e
r save
commit
|
commitdiff
|
tree
2014-04-09
Axel Richard
[4
3
2002] Undo doesn't up
d
at
e
content viewers & merge
.
.
.
commit
|
commitdiff
|
tree
2014-04-09
Axel Richar
d
[
43214
1
] Conflicts diffs order change between compa
r
isons
commit
|
commitdiff
|
tree
2014-04-01
Axel Richard
[431
6
93] The
a
ctive group pr
o
vide
r
is
n
ot selecte
d
.
.
.
commit
|
commitdiff
|
tree
2014-03-31
Axel
R
i
c
hard
[431495]
C
hange Group Provide
r
must
select the first
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
A
x
el Richard
[40
6
516] Manage
Param
e
terized Types
i
n Compa
r
is
o
n
commit
|
commitdiff
|
tree
2014-03-28
A
xe
l
Richard
[
430
6
97] Toolbar appears
t
wice when Replace With action
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Ax
e
l Ri
c
hard
Fix ty
p
o for Compare With Each Othe
r
in Dialo
g
/
Editor
commit
|
commitdiff
|
tree
2014-03-28
Axel Ric
h
a
rd
[42925
6
] I
n
clude read on
l
y w
o
rks
p
a
ce resource
s
in
scope
commit
|
commitdiff
|
tree
2014-03-28
Axel Richard
[
4
18472] Cannot merge a move from
n
est
e
dCl
a
ssi
f
i
e
r
.
.
.
commit
|
commitdiff
|
tree
2014-03-27
A
xel Rich
a
rd
Update Luna target file to M6
commit
|
commitdiff
|
tree
2014-03-26
Axel Ri
c
hard
[42891
6
] Rejecting
addition with local history d
o
esn
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
Axel Ric
h
ard
[40
6
4
3
9] EMF Compare does n
o
t suppo
r
t list with null
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
Axel Richard
[
4
173
6
0] NPE
w
he
n
c
omparing Resource
s
not c
o
ntai
n
e
d
.
.
.
commit
|
commitdiff
|
tree
2014-03-24
Axel Richa
r
d
[428918] Fix "Repl
a
ce with"
preview is broken by EMF
.
.
.
commit
|
commitdiff
|
tree
2014-03-24
Axel
Ri
c
h
ard
Incre
a
se t
a
rgetplatform D
S
L f
i
les version to 2
.
0
.
1
commit
|
commitdiff
|
tree
next