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
EMF Compare tutorial: Tutorial part 1
2014-06-20
Arthur
D
a
u
ssy
EMF Co
m
p
a
re tutorial: Tu
t
orial part
1
commit
|
commitdiff
|
tree
2014-06-20
Arth
u
r
Daussy
E
M
F Compare tutorial: EXTl
i
bra
r
y p
l
ugins
commit
|
commitdiff
|
tree
2014-06-03
Axel Richard
[435
2
5
1
]
[435252] Update doc for Luna
commit
|
commitdiff
|
tree
2014-05-28
A
x
e
l R
i
c
h
ard
[434828] T
e
s
t
Me
r
ge Confli
c
t
D
iff With
Conflicting
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Ar
t
hur Daussy
[43482
8
] T
e
st Merge Conflict Diff Wit
h
Conflicting
.
.
.
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-28
Art
h
ur
D
aussy
[43
4
822
]
Conflict betwe
e
n move and d
e
l
e
te
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-27
Ax
e
l Richard
[435743] Fix D
i
agrams node are not displayed anymore
.
.
.
commit
|
commitdiff
|
tree
2014-05-26
Axel Ric
h
a
r
d
[
435617] Fix Structure M
e
rge
V
iew
e
r co
n
tent with refi
n
e
d
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Arthur Dauss
y
[435365
]
Cas
c
adingFilter s
h
ouldn't fi
l
ter out c
h
a
n
ges
.
.
.
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-23
A
x
el R
i
c
har
d
[431882] Fix Illega
l
S
t
ateExcept
i
o
n
in
c
ase o
f
Ps
e
u
d
o
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
A
x
el
Richard
[
435053]
Ad
d
Ps
e
udo conflicts test
s
.
commit
|
commitdiff
|
tree
2014-05-21
Ax
e
l
R
ichard
[
4
35376] Conflicted s
u
bdiffs
s
h
o
ul
d
n't
b
e
merge
d
w
h
en
.
.
.
commit
|
commitdiff
|
tree
2014-05-20
Arth
u
r
D
aussy
[434827
]
Wrong overlay ico
n
a
fter merge
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-20
A
xel Richard
[
4
3
4866] Real Add C
o
n
f
lict Display
commit
|
commitdiff
|
tree
2014-05-07
Axel Richard
[
434200] A
c
ce
p
t/Reject
d
i
f
fere
n
ce fails in some cases
commit
|
commitdiff
|
tree
2014-05-06
Axel
R
ichard
[434165]
M
ark conse
q
uences as me
r
ge
commit
|
commitdiff
|
tree
2014-05-06
Axel
Richard
[431643] Fix Manage case of no selected item
.
commit
|
commitdiff
|
tree
2014-05-05
Ax
e
l Richard
[431643] Fix Man
a
ge case of no se
l
ected item
.
commit
|
commitdiff
|
tree
2014-05-05
Axel Rich
a
rd
Add
p
s
eudo conflict diff
s
to the r
e
quired con
s
equences
.
.
.
commit
|
commitdiff
|
tree
2014-04-28
Ax
e
l Richa
r
d
[431643
]
Manage cas
e
of
n
o selected item
.
commit
|
commitdiff
|
tree
2014-04-28
A
xel Ri
c
hard
[431643
]
Manage
c
ases of no
diffe
r
ences
a
n
d
n
o visible
.
.
.
commit
|
commitdiff
|
tree
2014-04-17
Axel Ric
h
ard
Add
eq
u
i
v
a
lences to the required cons
e
qu
e
n
c
es shown
.
.
.
commit
|
commitdiff
|
tree
2014-04-10
Art
h
u
r
D
aussy
Add descri
p
t
ion for "UML re
f
in
e
d element" filter
.
commit
|
commitdiff
|
tree
2014-04-10
Arthur Daussy
Add a d
e
scripti
o
n to "Diag
r
am
R
efined element
s
"
.
commit
|
commitdiff
|
tree
2014-04-10
Arthur Daussy
Ad
d
descrip
t
ion
a
nd lab
e
l
to "Diagram post process
o
r"
commit
|
commitdiff
|
tree
2014-04-10
Arthur
D
aussy
Eng
i
nes
preference page: Correct message dial
o
g
commit
|
commitdiff
|
tree
2014-04-09
Axel R
i
chard
n
o
rmalize EOLs in
the core
(
third pass)
commit
|
commitdiff
|
tree
2014-04-09
Arthur
D
a
ussy
[429636] Documentation update
:
Group
s
commit
|
commitdiff
|
tree
2014-04-09
Arthur
Daussy
[430372] Do
c
ume
n
tatio
n
update
.
commit
|
commitdiff
|
tree
2014-04-09
Axel Richar
d
[432014] Toolbar
appears twi
c
e
a
f
ter
sa
v
e
commit
|
commitdiff
|
tree
2014-04-08
Arthur D
a
ussy
[43068
2
] N
e
w t
e
st: Test Mod
e
l
R
esolv
e
r
M
anager
commit
|
commitdiff
|
tree
2014-04-08
Arthur Daussy
[430682]
User Doc: Model resolution
commit
|
commitdiff
|
tree
2014-04-07
Art
h
u
r
D
a
ussy
Im
p
roves preference page UI
.
commit
|
commitdiff
|
tree
2014-04-07
Arthu
r
Dauss
y
[430682] Improves ModelRe
s
o
lverManager
commit
|
commitdiff
|
tree
2014-04-03
A
rthur Daussy
[429441] Use
r
doc update: Post
p
rocessors
c
onfigur
a
ti
o
n
commit
|
commitdiff
|
tree
2014-04-03
Ar
t
hur
Daussy
[431785] Corre
c
t sync
h
ronization me
c
hani
s
m
commit
|
commitdiff
|
tree
2014-04-03
Arthur Dauss
y
[427126]
Us
e
r d
o
c updat
e
: Engine confi
g
uration
commit
|
commitdiff
|
tree
2014-04-02
Arthur D
a
u
ssy
I
m
pro
v
e
ments
and corrections
o
n MatchEn
g
i
n
eRegistryWrapper
.
commit
|
commitdiff
|
tree
2014-04-02
Arthur Daussy
New
test
s
: Test ItemRe
g
istry
commit
|
commitdiff
|
tree
2014-04-02
Arthur Daussy
[
4
29636] Ad
d
Grou
p
Synchronization beha
v
ior mechanism
.
commit
|
commitdiff
|
tree
2014-04-01
Axel Richard
[4316
9
3] The
a
ctive group provi
d
er is
not
s
e
lected
.
.
.
commit
|
commitdiff
|
tree
2014-03-31
Arthu
r
Daussy
[429636] Create p
r
eference page f
o
r g
r
oups
commit
|
commitdiff
|
tree
2014-03-31
Arthur Daussy
[
4
3
0
68
2
] Prefere
n
ce
p
ag
e
f
or Mod
e
l Resol
v
ing mechanism
commit
|
commitdiff
|
tree
2014-03-31
Arthur Daus
s
y
[430682] Refactor
i
ng o
f
IModelResolver
commit
|
commitdiff
|
tree
2014-03-31
Axel Richard
[431495] Ch
a
nge
G
r
oup P
r
ovider mu
s
t select
the fi
r
st
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Axel
Richard
[406516
]
M
a
nage Par
a
meterized Types in C
o
m
p
arison
commit
|
commitdiff
|
tree
2014-03-28
A
xel Richard
F
i
x typo
f
or Compare Wi
t
h Each Other in
Dialo
g
/Editor
commit
|
commitdiff
|
tree
2014-03-28
A
xel Richar
d
[
4
29256] Include re
a
d
o
nly workspace resour
c
es in scope
commit
|
commitdiff
|
tree
2014-03-28
Axel Richar
d
[418472] C
a
nnot m
e
rge
a move f
r
om nestedClassifier
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Mikaël Barbero
Add conten
t
merge viewer fo
r
default
E
MFCompare
content
.
.
.
commit
|
commitdiff
|
tree
2014-03-26
Axel R
i
char
d
[
4
28916] Reject
i
ng addition wit
h
lo
c
al history doesn
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
A
x
el Richard
[
4
0
6439] EMF C
o
mpare
do
e
s not support list with
n
u
ll
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
Axel Richar
d
[41736
0
] NPE when co
m
paring Resou
r
ces not contained
.
.
.
commit
|
commitdiff
|
tree
2014-03-24
Arthur Dauss
y
Typ
o
error in de
v
elop
e
r
d
ocumen
t
ation
.
commit
|
commitdiff
|
tree
2014-03-24
Ax
e
l
Rich
a
rd
I
n
crease targetplatform DSL files ver
s
ion to 2
.
0
.
1
commit
|
commitdiff
|
tree
2014-03-24
Arthu
r
D
aussy
Remove usele
s
s pref
e
rence tab
.
commit
|
commitdiff
|
tree
2014-03-13
Axel Richard
[4291
2
3] SWTExcep
t
ion in TableMergeViewer when ch
a
nging
.
.
.
commit
|
commitdiff
|
tree
2014-03-13
Axel
R
ichard
[429122] Wrong label used in Struc
t
ureMe
r
geViewer
commit
|
commitdiff
|
tree
2014-03-13
Axel R
i
c
h
ard
Fix bro
k
e
n
l
inks i
n
develop
e
r g
u
ide
commit
|
commitdiff
|
tree
2014-03-10
Axel Richard
Fix wrong ke
y
s when put WeightProvider
in Registry
commit
|
commitdiff
|
tree
2014-03-10
Axel Richard
Improves pe
r
for
m
ances of
W
eightProvide
r
Regist
r
y
commit
|
commitdiff
|
tree
2014-03-10
A
x
el Richard
Ad
d
W
e
i
g
htP
r
o
v
ider Re
g
i
s
try
commit
|
commitdiff
|
tree
2014-03-07
A
x
el
R
ichard
Update RCP UI extensio
n
points re
f
erences in user
.
.
.
commit
|
commitdiff
|
tree
2014-03-05
Axel Ric
h
ard
Fix broken
links in o
.
e
.
emf
.
compare
.
doc/FAQ
commit
|
commitdiff
|
tree
2014-03-05
Axel
R
ichard
Fix typo i
n
Ma
t
ch
E
ngi
n
eFact
o
ryRegistryWrapp
e
r
n
a
m
e
commit
|
commitdiff
|
tree
2014-02-25
Axel Richard
Improves updateCha
n
g
e
dDependencies() in Projec
t
ModelResolve
r
commit
|
commitdiff
|
tree
2014-02-17
Axel Ri
c
hard
[
4
18163]
M
anage display and merge of UML Stereotype
.
.
.
commit
|
commitdiff
|
tree
2014-02-17
A
xel Richard
[
418
1
6
3
] Use safe
versio
n
of
e
G
e
t and eSet i
n
M
erg
e
rs
commit
|
commitdiff
|
tree
2014-02-14
A
x
el
R
ichard
Move merge
viewer
r
elated API from provisi
o
nal to pub
l
ic
.
commit
|
commitdiff
|
tree
2014-02-14
A
xel Richard
Move ContentM
e
r
g
eViewer
a
c
c
e
ssor related
AP
I
from prov
i
siona
.
.
.
commit
|
commitdiff
|
tree
2014-02-06
Axe
l
Rich
a
r
d
Move fi
l
ters
& gr
o
up
s
related API from provisional
.
.
.
commit
|
commitdiff
|
tree
2014-02-01
Axel Richar
d
Update target platform fo
r
Luna M5
commit
|
commitdiff
|
tree
2014-01-28
Axel Ri
c
h
a
rd
[4
2
6
72
6
] A "toString()" is returned for the label of
.
.
.
commit
|
commitdiff
|
tree
2014-01-28
Axel Richa
r
d
Impro
v
e per
f
ormance of ProjectModel
R
esolver
commit
|
commitdiff
|
tree
2013-11-19
Ax
e
l
Richard
Fix condition
b
u
g in ProximityEObj
e
ct
M
atc
h
er#cre
a
teMatches
commit
|
commitdiff
|
tree
2013-11-12
Axel
Richard
[42
1
083] Fix Difference
Group provider
s
are shared
.
.
.
commit
|
commitdiff
|
tree
2013-10-30
Axel Ri
c
hard
[416413] Fix Difference not
s
e
lected i
n
content merge
.
.
.
commit
|
commitdiff
|
tree
2013-10-09
Ax
e
l
Richar
d
[409004] - Fix The 'merge all' action doesn'
t
set the
.
.
.
commit
|
commitdiff
|
tree
2013-10-03
Axel Richard
[418
6
00
]
F
i
x U
n
d
o
/Redo menu items not
avai
l
able
commit
|
commitdiff
|
tree
2013-09-27
Axel Richard
Update Acce
p
tA
l
l and R
e
jectAll ha
n
dl
e
r
s
& co
m
mands
commit
|
commitdiff
|
tree
2013-09-27
A
x
el R
i
chard
Update UML
Specific
A
ccessor
s
commit
|
commitdiff
|
tree
2013-09-11
Ax
e
l Richard
Up
d
a
t
e
r
e
ject diff overall icon
.
commit
|
commitdiff
|
tree
2013-09-06
Axel
R
ichard
[416
4
4
1
] - Enhance "S
h
ow consequence
s
" dropdown menu
commit
|
commitdiff
|
tree
2013-07-26
A
x
el R
i
chard
[
409400] Fix Cla
s
sCastException double clicking on
.
.
.
commit
|
commitdiff
|
tree
2013-07-25
Axel R
i
chard
[4
0
0424] Next Diff
e
rence b
u
tton doesn't select the
.
.
.
commit
|
commitdiff
|
tree
2013-07-25
Axel R
i
chard
[4
1
3606] Mo
v
e
diff
e
rence
s
a
r
e not
dis
p
lay in the structure
.
.
.
commit
|
commitdiff
|
tree
2013-07-22
Axel Richard
New extension point to extend gro
u
p providers
commit
|
commitdiff
|
tree
2013-07-16
A
x
el
Richard
[413041] Refresh viewer one time wh
e
n init fi
l
t
e
rs
commit
|
commitdiff
|
tree
2013-07-16
Axel Ri
c
hard
[
411493] Select
e
d filters are not alway
s
applied
t
o
.
.
.
commit
|
commitdiff
|
tree
2013-07-16
Mikaël Barbe
r
o
Ref
a
ct
o
r Group
s
.
commit
|
commitdiff
|
tree
2013-06-28
Mikaël Ba
r
bero
add Kepl
e
r final target platfor
m
defin
i
tion
commit
|
commitdiff
|
tree
2013-06-17
A
xel Richa
r
d
M
anage
selected filters in ContentMergeViewer parts
.
commit
|
commitdiff
|
tree
2013-06-10
Laurent Go
u
b
et
[410073] Cache the gr
o
u
p
s
inste
a
d
o
f
recompu
t
i
n
g them
.
.
.
commit
|
commitdiff
|
tree
2013-06-07
Laurent G
o
ubet
[410072]
P
r
operly save
r
i
g
ht
content from textual viewer
s
.
commit
|
commitdiff
|
tree
2013-05-16
Axel Rich
a
rd
R
ename Sub
D
iff
E
lementsFilte
r
a
s
Cascad
i
ngDifferences
F
il
t
er
commit
|
commitdiff
|
tree
2013-04-30
Axel Richard
[
4
0
6310] Item doesn
'
t collapse a
f
t
er slecting a
n
ew
.
.
.
commit
|
commitdiff
|
tree
2013-04-30
Axel Ric
h
a
rd
[406513]
D
efi
n
e a label of 42 whi
t
espaces
to ma
k
e the
.
.
.
commit
|
commitdiff
|
tree
2013-04-29
Axel R
i
chard
[
4
06539] - NPE when using groups
commit
|
commitdiff
|
tree
2013-04-25
A
x
el Richard
[406
5
4
0] - D
i
ff not selected in co
n
tent viewe
r
s
commit
|
commitdiff
|
tree
2013-04-24
Axel Richard
[406401]
Fix
b
ug in SingleStruct
u
ralFeatureAcces
s
o
rImpl
.
.
.
commit
|
commitdiff
|
tree
next