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 Daussy
[4348
2
8] T
e
st Merge Conflict Di
f
f With
C
o
nf
l
icting
.
.
.
Also-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-05-28
Art
h
u
r Daussy
[434822] Conflict between move
a
nd d
e
l
e
te
Also-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-05-26
A
x
e
l
Richar
d
[435617] Fix Stru
c
ture Merge Vi
e
wer content wit
h
refined
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
A
r
th
u
r D
a
ussy
[435365
]
CascadingFilter shouldn't f
i
lter out chang
e
s
.
.
.
Also-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-05-23
Axel Ric
h
ar
d
[43
1
882] Fix Il
l
egalStateException in
c
ase o
f
Pseu
d
o
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Axel Richar
d
[4
3
5053] A
d
d Pseudo conflicts tests
.
commit
|
commitdiff
|
tree
2014-05-21
Axel Richard
[
4
35376]
C
onflicted subdiff
s
shouldn't be m
e
rge
d
when
.
.
.
commit
|
commitdiff
|
tree
2014-05-20
A
r
thur
Daussy
[434
8
2
7
]
W
rong overlay icon a
f
ter merge
Also-by: Axel Richard <
axel.richard@obeo.fr
>
commit
|
commitdiff
|
tree
2014-05-20
Axel
Richard
[434866]
R
e
a
l
Add Conflict Display
commit
|
commitdiff
|
tree
2014-05-07
Axel Richar
d
[
4342
0
0] Acc
e
pt/Rej
e
ct diffe
r
e
n
c
e
f
ails in some cases
commit
|
commitdiff
|
tree
2014-05-06
Axel Richard
[434165] Mark consequences as
merge
commit
|
commitdiff
|
tree
2014-05-06
Axel Richard
[4
3
1643] Fix
M
a
nage ca
s
e
o
f n
o
selected
i
t
em
.
commit
|
commitdiff
|
tree
2014-05-05
A
x
el Richard
[431643] Fix Manag
e
cas
e
o
f no sel
e
ct
e
d item
.
commit
|
commitdiff
|
tree
2014-05-05
Axel Richa
r
d
Add pseudo conflict dif
f
s to th
e
requ
i
r
ed
c
onseque
n
ces
.
.
.
commit
|
commitdiff
|
tree
2014-04-28
Axel Ric
h
a
rd
[431643]
M
an
a
g
e
case
o
f no selected item
.
commit
|
commitdiff
|
tree
2014-04-28
Axel Richard
[431643] Mana
g
e
cases of no differ
e
n
ces
a
nd no
v
isible
.
.
.
commit
|
commitdiff
|
tree
2014-04-17
Axel Richard
Ad
d
equival
e
nces to the required consequences shown
.
.
.
commit
|
commitdiff
|
tree
2014-04-10
Ar
t
h
ur Daussy
Add de
s
c
ription for "UML r
e
fined el
e
ment
"
fi
l
ter
.
commit
|
commitdiff
|
tree
2014-04-10
Arthur Daussy
Add a description
t
o "D
i
agr
a
m Refined elements"
.
commit
|
commitdiff
|
tree
2014-04-10
A
r
t
h
u
r
Daussy
Add
d
esc
r
ipti
o
n and
l
abel to "Di
a
g
r
am
post
p
rocessor"
commit
|
commitdiff
|
tree
2014-04-10
Arth
u
r Daussy
E
n
gines preference
p
age: C
o
rrect message dialog
commit
|
commitdiff
|
tree
2014-04-09
Axel
R
ich
a
r
d
normalize EOL
s
i
n
t
h
e core (third pass)
commit
|
commitdiff
|
tree
2014-04-09
Arthur Dau
s
sy
[429636] Documentat
i
on up
d
a
te: Grou
p
s
commit
|
commitdiff
|
tree
2014-04-09
Arthur D
a
ussy
[430372] Documen
t
ation u
p
date
.
commit
|
commitdiff
|
tree
2014-04-09
Axel Richard
[432
0
14] Toolbar appears twice after
save
commit
|
commitdiff
|
tree
2014-04-08
Arthur Dau
s
sy
[43068
2
]
New test
:
Test ModelRes
o
lv
e
rMa
n
ager
commit
|
commitdiff
|
tree
2014-04-08
Arthur D
a
ussy
[430682] User Do
c
: Model resolution
commit
|
commitdiff
|
tree
2014-04-07
Arthur Daussy
Improves preferenc
e
page
UI
.
commit
|
commitdiff
|
tree
2014-04-07
A
r
thur Daus
s
y
[430682]
I
mp
r
oves Model
R
es
o
l
v
erManag
e
r
commit
|
commitdiff
|
tree
2014-04-03
Arthur
D
aus
s
y
[42
9
4
41] User doc update
:
Post processors configuration
commit
|
commitdiff
|
tree
2014-04-03
Arthur Daussy
[431785] Co
r
rect sync
h
ronization
mechanism
commit
|
commitdiff
|
tree
2014-04-03
A
rth
u
r
Dau
s
sy
[427126] U
s
er doc update: Engine co
n
figuration
commit
|
commitdiff
|
tree
2014-04-02
Arth
u
r Daus
s
y
Imp
r
o
vements and
c
orr
e
ctio
n
s
o
n Ma
t
c
h
EngineRegistryWrap
p
er
.
commit
|
commitdiff
|
tree
2014-04-02
Arthur Daussy
New tests:
T
est It
e
mRegist
r
y
commit
|
commitdiff
|
tree
2014-04-02
Arthur Daussy
[429636] Add Grou
p
Sy
n
chronization behavior mechanism
.
commit
|
commitdiff
|
tree
2014-04-01
Axel Richa
r
d
[4316
9
3] T
h
e active group pr
o
vider is not sel
e
cted
.
.
.
commit
|
commitdiff
|
tree
2014-03-31
Arthur Daussy
[429636] Crea
t
e pref
e
re
n
ce p
a
ge f
o
r
groups
commit
|
commitdiff
|
tree
2014-03-31
Arthur
D
a
u
s
sy
[4306
8
2] P
r
efer
e
n
ce pag
e
for Mo
d
el Re
s
o
l
ving m
e
chanism
commit
|
commitdiff
|
tree
2014-03-31
Arthur Da
u
ssy
[4306
8
2] Refact
o
ring of IModelR
e
solver
commit
|
commitdiff
|
tree
2014-03-31
Axel Richard
[
4
31495] Chan
g
e Gr
o
up Provider must select
th
e
first
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Axel Ric
h
ard
[406516]
M
an
a
ge P
a
ramet
e
r
i
z
ed Types i
n
Comparison
commit
|
commitdiff
|
tree
2014-03-28
Axe
l
R
i
char
d
Fi
x
typo
f
or Com
p
are With Each Ot
h
er in D
i
alog/Editor
commit
|
commitdiff
|
tree
2014-03-28
Ax
e
l Ri
c
har
d
[4
2
9256] I
n
clu
d
e read only
w
or
k
s
p
ace resources in
scope
commit
|
commitdiff
|
tree
2014-03-28
A
x
el Richard
[418472] Cannot
m
erge a move fro
m
ne
s
tedClassifier
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Mikaël Barbero
Add co
n
te
n
t
merge
viewer for defa
u
lt EMFCompare cont
e
nt
.
.
.
commit
|
commitdiff
|
tree
2014-03-26
Axel Richard
[428
9
16
]
Rejecting addition wi
t
h
l
ocal history doesn
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
Axel Richard
[
4
06439]
E
MF Compare does not su
p
port
l
i
st
with nu
l
l
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
A
xe
l
Richar
d
[
4
17360
]
NPE when c
o
mparing Resources not
c
ontained
.
.
.
commit
|
commitdiff
|
tree
2014-03-24
Arthur
Da
u
ssy
Typo error
in developer
d
o
cu
m
enta
t
io
n
.
commit
|
commitdiff
|
tree
2014-03-24
Axel
Rich
a
rd
Increase targetplatform DSL files versio
n
to 2
.
0
.
1
commit
|
commitdiff
|
tree
2014-03-24
Ar
t
hur Dau
s
sy
Remove useless prefe
r
e
nce tab
.
commit
|
commitdiff
|
tree
2014-03-13
Axel Richard
[
429123
]
SWT
E
xception in TableM
e
rgeVie
w
er
w
h
e
n ch
a
ngin
g
.
.
.
commit
|
commitdiff
|
tree
2014-03-13
Axel Richard
[42
9
12
2
]
Wrong lab
e
l
us
e
d in StructureMergeV
i
ewer
commit
|
commitdiff
|
tree
2014-03-13
Ax
e
l Rich
a
r
d
Fix broken links in developer g
u
i
de
commit
|
commitdiff
|
tree
2014-03-10
Ax
e
l Richard
F
ix w
r
ong keys when put WeightProvide
r
in Regis
t
ry
commit
|
commitdiff
|
tree
2014-03-10
A
x
el
R
i
chard
Impr
o
ves performanc
e
s of WeightProvider Registry
commit
|
commitdiff
|
tree
2014-03-10
Axel Richard
Add We
i
g
h
tPr
o
v
ider
Registry
commit
|
commitdiff
|
tree
2014-03-07
Axel Ric
h
a
rd
Update
RCP UI
extensi
o
n p
o
ints
references in user
.
.
.
commit
|
commitdiff
|
tree
2014-03-05
Axel Ri
c
hard
Fi
x
broken links in o
.
e
.
emf
.
compare
.
doc/F
A
Q
commit
|
commitdiff
|
tree
2014-03-05
Axel
R
icha
r
d
Fix typo in MatchEng
i
ne
F
actoryRegistryWrapp
e
r n
a
me
commit
|
commitdiff
|
tree
2014-02-25
Axel Richard
Impr
o
v
es updateChangedDepend
e
ncies() in
Proj
e
ctModelRe
s
olver
commit
|
commitdiff
|
tree
2014-02-17
Axel Rich
a
rd
[418163] Manage display
a
nd merge o
f
UML Stereot
y
pe
.
.
.
commit
|
commitdiff
|
tree
2014-02-17
Axe
l
Richa
r
d
[4
1
8163] Use saf
e
version of eGet
a
nd eSet in Mergers
commit
|
commitdiff
|
tree
2014-02-14
A
x
el Richard
Move
merge v
i
ewer related API from pr
o
visional to publi
c
.
commit
|
commitdiff
|
tree
2014-02-14
A
xel Ri
c
ha
r
d
Mov
e
Conte
n
tMergeV
i
ewer
accessor r
e
lated API from prov
i
siona
.
.
.
commit
|
commitdiff
|
tree
2014-02-06
Axel Ri
c
h
a
rd
Move f
i
lters & grou
p
s related API
f
rom provisional
.
.
.
commit
|
commitdiff
|
tree
2014-02-01
Axel
R
icha
r
d
Update target
p
l
a
tfor
m
for L
u
n
a
M
5
commit
|
commitdiff
|
tree
2014-01-28
Axel Ri
c
ha
r
d
[426
7
26
]
A
"
toS
t
ring()" is returned for th
e
label of
.
.
.
commit
|
commitdiff
|
tree
2014-01-28
Axel Richard
Improve perfor
m
ance o
f
ProjectM
o
delRe
s
ol
v
e
r
commit
|
commitdiff
|
tree
2013-11-19
Axel Richard
Fix c
o
nditi
o
n
bug in ProximityEObjectMatcher#createMatches
commit
|
commitdiff
|
tree
2013-11-12
Axel Richard
[42
1
083]
Fix Di
f
f
e
rence G
r
oup providers are share
d
.
.
.
commit
|
commitdiff
|
tree
2013-10-30
Axel
Richa
r
d
[
4
1641
3
]
Fi
x
Difference not selecte
d
in content
m
er
g
e
.
.
.
commit
|
commitdiff
|
tree
2013-10-09
Axel Richard
[40900
4
] - Fix
T
he 'merge all' action do
e
sn't
s
et the
.
.
.
commit
|
commitdiff
|
tree
2013-10-03
Axel Richa
r
d
[418600
]
Fix Undo
/
R
edo men
u
items
not availabl
e
commit
|
commitdiff
|
tree
2013-09-27
A
x
el R
i
chard
U
p
date AcceptAll and Reject
A
ll handlers & c
o
mmands
commit
|
commitdiff
|
tree
2013-09-27
Axel R
i
chard
Update
U
ML Specific Accessors
commit
|
commitdiff
|
tree
2013-09-11
Axel Richard
Up
d
ate reject diff overall i
c
on
.
commit
|
commitdiff
|
tree
2013-09-06
Ax
e
l Richard
[
4
164
4
1] -
E
nhance "Show conse
q
uences" dropdown me
n
u
commit
|
commitdiff
|
tree
2013-07-26
Axel Richard
[
4
0
9400
]
Fix ClassCastE
x
ce
p
tion do
u
ble cl
i
ck
i
ng on
.
.
.
commit
|
commitdiff
|
tree
2013-07-25
Axel Richard
[40
0
424] Next Difference b
u
tton doe
s
n't select the
.
.
.
commit
|
commitdiff
|
tree
2013-07-25
Axel Richard
[413606] Move differe
n
ces a
r
e no
t
display in the structur
e
.
.
.
commit
|
commitdiff
|
tree
2013-07-22
Axel Richard
New
e
xtension point t
o
ext
e
n
d group
pr
o
v
iders
commit
|
commitdiff
|
tree
2013-07-16
Axel
R
i
chard
[4
1
304
1
] Refresh
v
i
ewer one time when
init
filters
commit
|
commitdiff
|
tree
2013-07-16
Axel Richard
[411493
]
Selecte
d
fil
t
e
rs a
r
e not a
l
ways a
p
plie
d
to
.
.
.
commit
|
commitdiff
|
tree
2013-07-16
Mikaël Barbero
Ref
a
ctor Gr
o
u
ps
.
commit
|
commitdiff
|
tree
2013-06-28
M
i
kaël Barbero
a
dd K
e
pler final target plat
f
orm defini
t
ion
commit
|
commitdiff
|
tree
2013-06-17
Axe
l
Richard
Manage selected
f
i
lters in Cont
e
ntMer
g
e
View
e
r parts
.
commit
|
commitdiff
|
tree
2013-06-10
La
u
r
en
t
Goubet
[410073] Ca
c
he the
g
roups instead of r
e
computing
t
h
em
.
.
.
commit
|
commitdiff
|
tree
2013-06-07
Laurent
Goubet
[410072] Properly s
a
ve
right content from textual
v
iewers
.
commit
|
commitdiff
|
tree
2013-05-16
A
x
el Rich
a
rd
Rename Sub
D
iffEl
e
mentsFilter as Cas
c
adingDifferencesFil
t
er
commit
|
commitdiff
|
tree
2013-04-30
Ax
e
l R
i
chard
[406310] It
e
m d
o
esn't co
l
la
p
se after slec
t
ing a new
.
.
.
commit
|
commitdiff
|
tree
2013-04-30
Axel Richa
r
d
[4065
1
3
] Define a label of 42 whitespaces to make the
.
.
.
commit
|
commitdiff
|
tree
2013-04-29
Axel
Richard
[406539] -
NPE when using groups
commit
|
commitdiff
|
tree
2013-04-25
A
xel Ri
c
har
d
[40
6
540] - Diff
not selected
in cont
e
nt viewers
commit
|
commitdiff
|
tree
2013-04-24
Ax
e
l Richard
[4064
0
1]
F
ix bu
g
i
n
Sing
l
eStructuralFeatureAccessorImpl
.
.
.
commit
|
commitdiff
|
tree
2013-04-24
Axel Richard
Improve R
e
s
o
u
rceAttachme
n
tC
h
a
ngeM
e
rgeViewerIte
m
#ge
t
Children()
commit
|
commitdiff
|
tree
2013-04-24
Axel Richard
Manag
e
cas
e
of ancestor in ResourceCont
e
ntsAccessorImpl
.
.
.
commit
|
commitdiff
|
tree
2013-04-23
Axel Richard
[40572
0
]
U
n
do doesn't work after a me
r
ge
commit
|
commitdiff
|
tree
2013-04-22
Axel Richard
[406201] -
Diff not selected in TreeViewer
commit
|
commitdiff
|
tree
2013-04-22
Axel Richard
Ma
n
age case of
a
n
ces
t
or in MatchA
c
cessor#ge
t
Items(
)
.
commit
|
commitdiff
|
tree
next