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
[434828] Test Merge Conflict Diff With Conflicting Diff With RequiredBy
2014-05-28
Art
h
ur
Daus
s
y
[4
3
4828]
Tes
t
M
e
r
ge Conf
l
ict Diff With Conf
l
i
ctin
g
.
.
.
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-28
Arthur Dau
s
sy
[43482
2
] Conflict betw
e
en move and delete
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-26
Ax
e
l
Richard
[435617] Fix Structure Merge Viewer cont
e
nt with
refined
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Art
h
ur Daussy
[435
3
65] Casc
a
dingFi
l
ter shouldn
'
t f
i
l
t
er out cha
n
ge
s
.
.
.
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-23
Axel Richa
r
d
[4318
8
2] Fix IllegalS
t
ateException in
case of P
s
eudo
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Axel Richard
[435053] Add
Pseudo co
n
fli
c
ts tests
.
commit
|
commitdiff
|
tree
2014-05-21
Ax
e
l
R
i
c
h
ard
[435376
]
Confl
i
c
t
ed subdiffs
shouldn
'
t be
mer
g
e
d
w
h
en
.
.
.
commit
|
commitdiff
|
tree
2014-05-20
A
r
thur Daussy
[
434827] Wrong
o
verlay icon after
m
erge
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-20
A
xel
R
ic
h
ard
[434866] Real Add C
o
n
f
lict D
i
sp
l
ay
commit
|
commitdiff
|
tree
2014-05-07
Axel
R
ic
h
ard
[43
4
2
00] Acc
e
pt/
R
eject differ
e
nc
e
f
a
ils in some cases
commit
|
commitdiff
|
tree
2014-05-06
Axel R
i
cha
r
d
[434165]
M
ark consequences as merge
commit
|
commitdiff
|
tree
2014-05-06
Axel Ri
c
h
a
rd
[431643] Fi
x
M
a
nag
e
case of no sel
e
cted
i
t
em
.
commit
|
commitdiff
|
tree
2014-05-05
A
x
el Richar
d
[431643]
Fix
Man
a
ge case of
no s
e
l
ected
i
tem
.
commit
|
commitdiff
|
tree
2014-05-05
Axel Richa
r
d
Add pseudo
c
o
n
fl
i
c
t diff
s
to
t
he
r
equired
c
onseq
u
ences
.
.
.
commit
|
commitdiff
|
tree
2014-04-28
Axel Richard
[431
6
43] Manage case of no s
e
lected
i
t
e
m
.
commit
|
commitdiff
|
tree
2014-04-28
A
x
el Richard
[4316
4
3
]
Manage
cases
of no differences
an
d
no vis
i
ble
.
.
.
commit
|
commitdiff
|
tree
2014-04-17
A
x
el Richar
d
Add e
q
uivalences to
the required consequences shown
.
.
.
commit
|
commitdiff
|
tree
2014-04-10
Arthur Daussy
Add descriptio
n
for
"
UML refined
e
lement" fi
l
ter
.
commit
|
commitdiff
|
tree
2014-04-10
A
rthu
r
Daussy
Add a descriptio
n
t
o
"Diagram Refine
d
elements
"
.
commit
|
commitdiff
|
tree
2014-04-10
A
r
thur Daussy
Add descr
i
ption and label to "Di
a
gr
a
m
p
os
t
pro
c
ess
o
r"
commit
|
commitdiff
|
tree
2014-04-10
Art
h
ur Daus
s
y
Engines p
r
eference page:
Correct message dial
o
g
commit
|
commitdiff
|
tree
2014-04-09
Axel Richard
normal
i
z
e
EOLs in th
e
c
o
re
(
th
i
rd pass)
commit
|
commitdiff
|
tree
2014-04-09
Arthur Da
u
s
sy
[429
6
3
6
] D
o
cumentation up
d
ate: Groups
commit
|
commitdiff
|
tree
2014-04-09
Arthu
r
D
aussy
[43037
2
] Doc
u
m
e
ntation updat
e
.
commit
|
commitdiff
|
tree
2014-04-09
Axel Richard
[43201
4
] Toolbar appea
r
s twice after save
commit
|
commitdiff
|
tree
2014-04-08
A
r
thur Daussy
[4306
8
2] New t
e
st: Te
s
t
ModelR
e
s
o
lverManage
r
commit
|
commitdiff
|
tree
2014-04-08
Ar
t
hur Dau
s
sy
[4306
8
2] User D
o
c:
Mode
l
re
s
olution
commit
|
commitdiff
|
tree
2014-04-07
Arthur Daus
s
y
Imp
r
oves preference pag
e
UI
.
commit
|
commitdiff
|
tree
2014-04-07
Ar
t
hur Daussy
[430
6
82] Impro
v
es ModelR
e
solverManager
commit
|
commitdiff
|
tree
2014-04-03
Arthur Daussy
[429441] User doc update: Post
processors configurati
o
n
commit
|
commitdiff
|
tree
2014-04-03
Arthur
Daussy
[
4
3
1
785]
C
orrect synchronization m
e
c
h
anism
commit
|
commitdiff
|
tree
2014-04-03
Arthu
r
Dau
s
sy
[42712
6
] User d
o
c
update: Engine conf
i
gura
t
ion
commit
|
commitdiff
|
tree
2014-04-02
Ar
t
hur
Daus
s
y
Improvements
and corre
c
t
i
ons on
M
atch
E
ngi
n
eRegistr
y
Wrapper
.
commit
|
commitdiff
|
tree
2014-04-02
Arthur Dauss
y
New test
s
:
T
est I
t
emRe
g
i
s
try
commit
|
commitdiff
|
tree
2014-04-02
Art
h
ur Dauss
y
[429636]
Ad
d
Group
S
y
n
chronizat
i
on be
h
a
vior mec
h
anism
.
commit
|
commitdiff
|
tree
2014-04-01
Axel Richard
[4316
9
3] The active g
r
oup provider is not sel
e
c
ted
.
.
.
commit
|
commitdiff
|
tree
2014-03-31
Arthur D
a
ussy
[
42
9
63
6
] C
r
eate prefe
r
e
nce page fo
r
groups
commit
|
commitdiff
|
tree
2014-03-31
Arthur Da
u
ssy
[430
6
82] Preference
pa
g
e for Model
Resolving mec
h
a
n
i
s
m
commit
|
commitdiff
|
tree
2014-03-31
Ar
t
hur D
a
ussy
[430682] Re
f
actoring of
IModelResolver
commit
|
commitdiff
|
tree
2014-03-31
Axel R
i
chard
[431495] Change G
r
o
u
p Provider m
u
st select the first
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Axel Richar
d
[40651
6
] Manage Parameter
i
z
e
d Ty
p
es i
n
Comparison
commit
|
commitdiff
|
tree
2014-03-28
A
x
el Richard
Fix typo
f
or Co
m
pare With Each O
t
h
er in Dialog/Editor
commit
|
commitdiff
|
tree
2014-03-28
A
xel R
i
chard
[
4292
5
6] Include read only workspace resources in scope
commit
|
commitdiff
|
tree
2014-03-28
A
xe
l
Richard
[
4
18472] Cannot merge a move from nested
C
lassifier
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Mikaël Barbero
Add content merg
e
viewer for defaul
t
EMFCompare content
.
.
.
commit
|
commitdiff
|
tree
2014-03-26
Axel Ric
h
ard
[4
2
8916
]
Rejecting additio
n
with l
o
ca
l
history
d
oesn
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
Axel Richard
[406439]
E
MF Compare does not support
l
i
s
t
with null
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
Axel Richard
[417360] NPE wh
e
n
com
p
aring Resources not contained
.
.
.
commit
|
commitdiff
|
tree
2014-03-24
Arthur Daussy
Typo error
i
n d
e
velope
r
documentati
o
n
.
commit
|
commitdiff
|
tree
2014-03-24
Axel Richard
I
ncrease targetplatf
o
rm DSL
f
iles
v
ersi
o
n to 2
.
0
.
1
commit
|
commitdiff
|
tree
2014-03-24
Arthu
r
Daussy
R
e
mo
v
e us
e
less preference tab
.
commit
|
commitdiff
|
tree
2014-03-13
Axel Ric
h
ard
[429
1
2
3] SWTE
x
ception in Tabl
e
MergeView
e
r w
h
en
c
hanging
.
.
.
commit
|
commitdiff
|
tree
2014-03-13
Axe
l
Ri
c
hard
[429122] W
r
ong label used in
StructureMergeViewer
commit
|
commitdiff
|
tree
2014-03-13
Axel Ri
c
h
ar
d
Fix broken
l
inks in developer guide
commit
|
commitdiff
|
tree
2014-03-10
Axel Richard
Fix wrong keys
w
h
en put
WeightPr
o
vider i
n
Re
g
istry
commit
|
commitdiff
|
tree
2014-03-10
Axel Richard
Improves performan
c
es
o
f
W
e
ig
h
t
P
rovide
r
R
e
g
is
t
ry
commit
|
commitdiff
|
tree
2014-03-10
Axel Richa
r
d
Add WeightProvider Registr
y
commit
|
commitdiff
|
tree
2014-03-07
Axel Ric
h
ard
Update RCP UI extens
i
on points referen
c
e
s in user
.
.
.
commit
|
commitdiff
|
tree
2014-03-05
A
x
el Richard
Fix broken li
n
ks in o
.
e
.
e
mf
.
compare
.
doc/FAQ
commit
|
commitdiff
|
tree
2014-03-05
Axel Richard
Fix
typo in MatchEng
i
neFacto
r
yRegistr
y
Wrapper name
commit
|
commitdiff
|
tree
2014-02-25
Axel
R
ichar
d
Imp
r
oves upda
t
eChangedDependencies
(
) i
n
ProjectModelR
e
solver
commit
|
commitdiff
|
tree
2014-02-17
Axel Rich
a
rd
[4181
6
3]
M
a
nage display and mer
g
e
of UML Stereotype
.
.
.
commit
|
commitdiff
|
tree
2014-02-17
Axel
R
ichard
[418163] Use saf
e
v
ers
i
on of
eGet an
d
e
S
e
t in Mergers
commit
|
commitdiff
|
tree
2014-02-14
Axel Rich
a
rd
Mov
e
merge viewer relate
d
API from provisional
t
o public
.
commit
|
commitdiff
|
tree
2014-02-14
Ax
e
l
Richa
r
d
Move ContentMergeVie
w
er acc
e
s
s
or related API from provisiona
.
.
.
commit
|
commitdiff
|
tree
2014-02-06
A
x
e
l
Richard
Move
filters
&
g
roups relat
e
d AP
I
from provisiona
l
.
.
.
commit
|
commitdiff
|
tree
2014-02-01
Ax
e
l
Rich
a
rd
Update target platform for Luna M5
commit
|
commitdiff
|
tree
2014-01-28
Axel
Ric
h
ard
[
426726] A "toString()" is re
t
urned
for the label of
.
.
.
commit
|
commitdiff
|
tree
2014-01-28
Axe
l
R
ichard
Improve perfor
m
ance of Project
M
odelResolver
commit
|
commitdiff
|
tree
2013-11-19
Ax
e
l
Ri
c
hard
Fix co
n
dition bu
g
in Proximit
y
EObject
M
atc
h
er#create
M
atches
commit
|
commitdiff
|
tree
2013-11-12
Axel Richard
[
4
21083] Fix Differen
c
e Group pro
v
iders a
r
e
sh
a
red
.
.
.
commit
|
commitdiff
|
tree
2013-10-30
Axel
R
ichard
[416
4
13] Fi
x
D
iffer
e
nc
e
n
ot selected in con
t
ent merge
.
.
.
commit
|
commitdiff
|
tree
2013-10-09
Axel Richard
[40
9
00
4
] - Fix The 'merge
a
ll' act
i
on
doesn't
set the
.
.
.
commit
|
commitdiff
|
tree
2013-10-03
Axel Richard
[4
1
8600] Fix Undo/
R
edo
menu ite
m
s no
t
availa
b
le
commit
|
commitdiff
|
tree
2013-09-27
Ax
e
l R
i
cha
r
d
Up
d
ate AcceptAl
l
a
n
d
Reje
c
tAll handlers & co
m
m
a
nd
s
commit
|
commitdiff
|
tree
2013-09-27
A
xel Ri
c
hard
Update
U
ML
S
pecifi
c
Acc
e
ssors
commit
|
commitdiff
|
tree
2013-09-11
A
xel Richa
r
d
U
p
date reject d
i
ff over
a
ll icon
.
commit
|
commitdiff
|
tree
2013-09-06
Axel Richard
[4
1
6
441]
-
En
h
ance "Show
c
ons
e
que
n
ces"
d
ropdow
n
menu
commit
|
commitdiff
|
tree
2013-07-26
Axel
R
i
c
har
d
[409400
]
Fix ClassCas
t
Excepti
o
n
dou
b
l
e clicking
on
.
.
.
commit
|
commitdiff
|
tree
2013-07-25
Axel Rich
a
rd
[400424] Next Diff
e
rence
b
ut
t
on do
e
sn't select the
.
.
.
commit
|
commitdiff
|
tree
2013-07-25
Axel
R
ichard
[41
3
606] Move dif
f
erences are not displa
y
in the structure
.
.
.
commit
|
commitdiff
|
tree
2013-07-22
Axel Ric
h
ard
New extensi
o
n point to exten
d
group providers
commit
|
commitdiff
|
tree
2013-07-16
Axel Richard
[
413041] Ref
r
esh viewe
r
o
n
e
time when in
i
t filt
e
rs
commit
|
commitdiff
|
tree
2013-07-16
Axel
R
ichard
[
4
11493] Selected fil
t
ers are n
o
t always applied to
.
.
.
commit
|
commitdiff
|
tree
2013-07-16
Mikaël Bar
b
e
r
o
Re
f
acto
r
G
roups
.
commit
|
commitdiff
|
tree
2013-06-28
M
ikaë
l
B
arbero
add
K
epler fi
n
al target
p
l
atform definition
commit
|
commitdiff
|
tree
2013-06-17
Axel Richard
Ma
n
age selected filters in ContentMergeViewer p
a
rts
.
commit
|
commitdiff
|
tree
2013-06-10
Laurent
G
ou
b
et
[
4100
7
3] Ca
c
he the gro
u
ps instead of recomputing them
.
.
.
commit
|
commitdiff
|
tree
2013-06-07
Lau
r
ent
G
oubet
[410072] Pr
o
perly save rig
h
t con
t
e
nt fr
o
m text
u
a
l
vi
e
we
r
s
.
commit
|
commitdiff
|
tree
2013-05-16
A
x
el Ri
c
hard
R
ename Su
b
DiffEl
e
m
en
t
sFilter as Cascad
i
ngD
i
fferencesFilter
commit
|
commitdiff
|
tree
2013-04-30
Axel Richard
[
4
06310] It
e
m
d
o
esn't collapse after slect
i
ng a new
.
.
.
commit
|
commitdiff
|
tree
2013-04-30
Axel Richard
[406513] Define a label of
42 whit
e
s
paces to make the
.
.
.
commit
|
commitdiff
|
tree
2013-04-29
Axel Richard
[40653
9
] - NPE when using
g
r
o
ups
commit
|
commitdiff
|
tree
2013-04-25
Axel Ric
h
ard
[4065
4
0] - Diff
n
o
t
se
l
ected in content viewers
commit
|
commitdiff
|
tree
2013-04-24
Axel Richar
d
[40
6
401] Fix bug
i
n SingleStructur
a
lFea
t
ureAcces
s
o
rImpl
.
.
.
commit
|
commitdiff
|
tree
2013-04-24
A
xel Ri
c
hard
Improve Resource
A
ttac
h
me
n
tCha
n
geMergeViewerItem#getChildren(
)
commit
|
commitdiff
|
tree
2013-04-24
Axel
R
i
chard
M
a
nage case of ancesto
r
in Reso
u
rceConte
n
tsAccessorI
m
pl
.
.
.
commit
|
commitdiff
|
tree
2013-04-23
Ax
e
l Richard
[
4
05720] Und
o
doesn
'
t
w
ork
a
f
t
er
a merge
commit
|
commitdiff
|
tree
2013-04-22
A
xel
Richard
[
40
6
2
01
]
- Diff not
s
elected in TreeV
i
ew
e
r
commit
|
commitdiff
|
tree
2013-04-22
Axel Ric
h
ard
Ma
n
age
case of ancestor in MatchAccessor#getI
t
ems()
.
commit
|
commitdiff
|
tree
next