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
Arthur
Daussy
[4
3
4
8
28] Test Merge
C
o
n
f
l
i
c
t Diff Wi
t
h Conflict
i
n
g
.
.
.
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-28
Arthur Dauss
y
[4348
2
2] Confli
c
t betwee
n
move a
n
d
de
l
ete
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-26
Axel Richard
[
4
3
5
617] Fix Structure Mer
g
e Viewer c
o
ntent with refined
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Arthur D
a
ussy
[435365] Cascading
F
ilte
r
s
h
oul
d
n't filter out change
s
.
.
.
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-23
Ax
e
l Rich
a
rd
[431882] Fix Ille
g
al
S
tateExcepti
o
n in ca
s
e of
Pseudo
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Axel R
i
c
h
ard
[
4
3
5053] Add P
s
eudo conflicts tests
.
commit
|
commitdiff
|
tree
2014-05-21
Axel Richar
d
[
4
3537
6
] C
o
nflicted subdiffs shou
l
dn't b
e
merged wh
e
n
.
.
.
commit
|
commitdiff
|
tree
2014-05-20
Arthur Daussy
[434
8
2
7] Wrong overlay
i
co
n
afte
r
merge
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-20
Ax
e
l
R
i
char
d
[434866] Real
Add Conflict Di
s
p
lay
commit
|
commitdiff
|
tree
2014-05-07
A
x
e
l
R
i
cha
r
d
[434200] Acce
p
t/Reject d
i
fference fails in some c
a
ses
commit
|
commitdiff
|
tree
2014-05-06
A
x
el Richard
[434165] Mark consequences
a
s m
e
rge
commit
|
commitdiff
|
tree
2014-05-06
A
x
e
l Richard
[
431
6
43
]
Fix Ma
n
age case of no selected item
.
commit
|
commitdiff
|
tree
2014-05-05
Axel Richar
d
[431643] Fix Manage case of no s
e
le
c
ted item
.
commit
|
commitdiff
|
tree
2014-05-05
Axel Richard
Add pseudo co
n
flict diffs to the required consequences
.
.
.
commit
|
commitdiff
|
tree
2014-04-28
A
xel Richard
[
4
3
1
643] Manage case of no se
l
e
cted item
.
commit
|
commitdiff
|
tree
2014-04-28
Axel R
i
c
hard
[431643] Manag
e
c
a
s
es
of no differences
and no visi
b
le
.
.
.
commit
|
commitdiff
|
tree
2014-04-17
Axel Richard
Add
equival
e
nces t
o
the re
q
uired c
o
n
sequences shown
.
.
.
commit
|
commitdiff
|
tree
2014-04-10
Arthur
D
aus
s
y
Ad
d
descri
p
tion fo
r
"
U
ML re
f
ined eleme
n
t" filter
.
commit
|
commitdiff
|
tree
2014-04-10
Arthu
r
Daussy
Ad
d
a des
c
ri
p
ti
o
n to "Diag
r
am Refined e
l
eme
n
t
s"
.
commit
|
commitdiff
|
tree
2014-04-10
A
rth
u
r
Daussy
Add desc
r
i
pt
i
on
a
n
d
l
ab
e
l to "Diagram
p
o
s
t proces
s
or"
commit
|
commitdiff
|
tree
2014-04-10
Art
h
u
r Daussy
Engines p
r
efere
n
ce page
:
C
orrect message dialog
commit
|
commitdiff
|
tree
2014-04-09
Axe
l
Ri
c
ha
r
d
normalize EOLs in t
h
e core
(
third pa
s
s)
commit
|
commitdiff
|
tree
2014-04-09
Arthur Dau
s
sy
[429636] Documentation update: Groups
commit
|
commitdiff
|
tree
2014-04-09
Art
h
ur Daussy
[430372
]
Documentation update
.
commit
|
commitdiff
|
tree
2014-04-09
A
x
el Richa
r
d
[
4
3
2
014] Toolbar appear
s
twice after save
commit
|
commitdiff
|
tree
2014-04-08
Ar
t
hur Daussy
[4
3
0
6
82] New
t
est: Tes
t
ModelResolverMa
n
ager
commit
|
commitdiff
|
tree
2014-04-08
Arthur Da
u
ssy
[
4
3
0
682] User Doc:
Mode
l
resolution
commit
|
commitdiff
|
tree
2014-04-07
Arthur Daussy
Impr
o
ves p
r
efer
e
nce p
a
ge UI
.
commit
|
commitdiff
|
tree
2014-04-07
Arthur D
a
ussy
[430
6
82
]
I
mprove
s
Mod
e
lResolverManager
commit
|
commitdiff
|
tree
2014-04-03
A
rth
u
r Dau
s
sy
[429441] User
d
oc upd
a
te: Post
p
r
ocessors configuration
commit
|
commitdiff
|
tree
2014-04-03
Arthur Daussy
[4
3
1785] C
o
rre
c
t synchro
n
ization me
c
h
a
nism
commit
|
commitdiff
|
tree
2014-04-03
Art
h
ur
D
a
u
ssy
[427126]
User doc
u
pdate: E
n
gine configuration
commit
|
commitdiff
|
tree
2014-04-02
Arthur Da
u
ssy
Improvements
and corrections o
n
MatchEngi
n
eRegistryWrapper
.
commit
|
commitdiff
|
tree
2014-04-02
Art
h
ur Daussy
New
t
es
t
s
: T
e
st ItemRe
g
i
s
t
ry
commit
|
commitdiff
|
tree
2014-04-02
Arth
u
r
D
auss
y
[429636] Ad
d
Group S
y
nchr
o
niz
a
tion
b
ehavior mechan
i
sm
.
commit
|
commitdiff
|
tree
2014-04-01
Axe
l
Richa
r
d
[43169
3
] The active
group provider
is not selected
.
.
.
commit
|
commitdiff
|
tree
2014-03-31
A
r
thur Dau
s
sy
[42
9
636
]
Create preference page for
g
roups
commit
|
commitdiff
|
tree
2014-03-31
A
rthur Dauss
y
[43
0
68
2
]
Preference p
a
ge for
Mode
l
Resolvi
n
g
mechanism
commit
|
commitdiff
|
tree
2014-03-31
Arthur
D
a
ussy
[430682] Refactoring of IMod
e
lResolver
commit
|
commitdiff
|
tree
2014-03-31
Axel
Richard
[431495] Ch
a
n
g
e G
r
oup Provider m
u
st select the first
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Axel Richard
[406
5
16] Manage Parameteri
z
ed
T
ypes in Comparis
o
n
commit
|
commitdiff
|
tree
2014-03-28
Axel
Ri
c
hard
Fix ty
p
o for Com
p
are With E
a
ch Other in Dialog
/
Editor
commit
|
commitdiff
|
tree
2014-03-28
Axel R
i
c
hard
[429256
]
I
nclude rea
d
o
nl
y
w
o
rkspace resources in scop
e
commit
|
commitdiff
|
tree
2014-03-28
Axel Richard
[
418472] Ca
n
not merge a mo
v
e fr
o
m ne
s
tedClassifier
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Mikaël Bar
b
ero
Add
content merge viewer fo
r
default
E
MFCompar
e
con
t
ent
.
.
.
commit
|
commitdiff
|
tree
2014-03-26
Ax
e
l Ric
h
ard
[4
2
8916] Rejecting addition w
i
th lo
c
al h
i
s
t
o
r
y
doesn
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
Ax
e
l
Richard
[40
6
439
]
EMF Compare does not
support l
i
st with null
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
A
xel Richard
[417360] NP
E
when compa
r
ing
R
esources not contained
.
.
.
commit
|
commitdiff
|
tree
2014-03-24
Art
h
ur Daussy
Typo error in de
v
elop
e
r d
o
cum
e
ntatio
n
.
commit
|
commitdiff
|
tree
2014-03-24
Axel Ri
c
hard
Increase targetplatform DSL files version
to
2
.
0
.
1
commit
|
commitdiff
|
tree
2014-03-24
Arthur Daussy
Rem
o
ve useless preference tab
.
commit
|
commitdiff
|
tree
2014-03-13
Axel Richard
[4
2
91
2
3] SWT
E
x
ception in T
a
bleMergeView
e
r when chang
i
ng
.
.
.
commit
|
commitdiff
|
tree
2014-03-13
Axel Richard
[429122
]
Wrong label used
i
n StructureMergeView
e
r
commit
|
commitdiff
|
tree
2014-03-13
Axel Ri
c
har
d
Fix
broke
n
links in deve
l
o
per g
u
ide
commit
|
commitdiff
|
tree
2014-03-10
Axel Richar
d
F
i
x
w
ro
n
g
k
eys when p
u
t Weigh
t
Prov
i
der in
R
egistry
commit
|
commitdiff
|
tree
2014-03-10
Axel Rich
a
rd
Improves perform
a
nc
e
s of WeightProv
i
der Registr
y
commit
|
commitdiff
|
tree
2014-03-10
A
xel Ric
h
ard
A
d
d Weight
P
r
o
vider Reg
i
stry
commit
|
commitdiff
|
tree
2014-03-07
Ax
e
l Richard
Update
RCP U
I
e
x
tension point
s
refere
n
ces in u
s
er
.
.
.
commit
|
commitdiff
|
tree
2014-03-05
Axel Richard
F
ix broken
l
ink
s
i
n o
.
e
.
emf
.
compare
.
doc/FAQ
commit
|
commitdiff
|
tree
2014-03-05
Axel Richard
Fix typ
o
in
M
atchEn
g
ineFactoryRegistryWrapper name
commit
|
commitdiff
|
tree
2014-02-25
Ax
e
l
Ri
c
h
a
rd
Improve
s
updateChang
e
dDepend
e
ncies() in P
r
o
j
e
c
tModelResolve
r
commit
|
commitdiff
|
tree
2014-02-17
Axel Rich
a
rd
[418163] Manage
disp
l
ay and m
e
rge of UML
Stereotype
.
.
.
commit
|
commitdiff
|
tree
2014-02-17
A
x
el Ri
c
hard
[418163]
Use safe
version of eGet and eSet in
M
erg
e
r
s
commit
|
commitdiff
|
tree
2014-02-14
A
x
el Richar
d
Move
m
e
r
ge
vi
e
wer related API from provisional
t
o
p
ublic
.
commit
|
commitdiff
|
tree
2014-02-14
A
x
el Richard
Move C
o
ntentMergeVie
w
e
r
acce
s
sor related API fro
m
provisi
o
na
.
.
.
commit
|
commitdiff
|
tree
2014-02-06
Axel
R
icha
r
d
Move filters & gr
o
ups related API from provis
i
o
nal
.
.
.
commit
|
commitdiff
|
tree
2014-02-01
A
x
el
Richard
Update targe
t
platform for Luna M
5
commit
|
commitdiff
|
tree
2014-01-28
Axel R
i
chard
[
4
2
6726] A "
t
oString(
)
" is returned for the label of
.
.
.
commit
|
commitdiff
|
tree
2014-01-28
Axel Richard
Improve performance of Projec
t
Model
R
esolver
commit
|
commitdiff
|
tree
2013-11-19
Axel Richar
d
Fix condition
bug
in Prox
i
mityEObjectMat
c
her#createMatches
commit
|
commitdiff
|
tree
2013-11-12
Axel R
i
chard
[421083] Fix Difference Gr
o
u
p
p
rovide
r
s
a
re sha
r
ed
.
.
.
commit
|
commitdiff
|
tree
2013-10-30
Axel Richard
[416413] Fix Difference not selected in con
t
ent merge
.
.
.
commit
|
commitdiff
|
tree
2013-10-09
Axe
l
Richard
[4090
0
4] - Fix The 'merge all' action doesn't s
e
t
t
he
.
.
.
commit
|
commitdiff
|
tree
2013-10-03
Axel Richa
r
d
[418600]
F
ix Undo/Redo menu items no
t
avai
l
able
commit
|
commitdiff
|
tree
2013-09-27
Axel
R
ichard
Update AcceptAll and
RejectAll han
d
l
er
s
& commands
commit
|
commitdiff
|
tree
2013-09-27
Axel
R
ichard
U
pd
a
te UML
S
pecific Accessors
commit
|
commitdiff
|
tree
2013-09-11
Axel Richard
Update reject diff overall ic
o
n
.
commit
|
commitdiff
|
tree
2013-09-06
Axel Ric
h
ar
d
[4
1
6441] - E
n
hanc
e
"Show cons
e
q
u
en
c
e
s
" dropdow
n
menu
commit
|
commitdiff
|
tree
2013-07-26
A
xel R
i
chard
[
4
09400] Fix Cla
s
s
CastException double clicking on
.
.
.
commit
|
commitdiff
|
tree
2013-07-25
Axe
l
Richard
[40042
4
] Ne
x
t
D
iffere
n
ce
bu
t
t
o
n do
e
s
n't select the
.
.
.
commit
|
commitdiff
|
tree
2013-07-25
Ax
e
l Richard
[4136
0
6]
Move differ
e
nces ar
e
not display in the struc
t
ure
.
.
.
commit
|
commitdiff
|
tree
2013-07-22
Axel Richar
d
N
ew exte
n
sion
p
oint t
o
extend g
r
o
up provider
s
commit
|
commitdiff
|
tree
2013-07-16
A
x
el R
i
chard
[413041]
R
efresh
v
i
e
wer on
e
time when init filters
commit
|
commitdiff
|
tree
2013-07-16
A
x
el Richard
[411493] Selected filters a
r
e not al
w
a
y
s applied to
.
.
.
commit
|
commitdiff
|
tree
2013-07-16
Mikaë
l
Barbero
Refa
c
t
o
r Groups
.
commit
|
commitdiff
|
tree
2013-06-28
Mik
a
ë
l
Barbero
add Kepler final targe
t
pl
a
tform definition
commit
|
commitdiff
|
tree
2013-06-17
Axel Richard
Mana
g
e selected
f
i
l
te
r
s in Conte
n
tMergeViewer parts
.
commit
|
commitdiff
|
tree
2013-06-10
Laurent Gou
b
et
[410073] Cache the groups
instead of rec
o
m
p
uting them
.
.
.
commit
|
commitdiff
|
tree
2013-06-07
Laurent Goub
e
t
[4
1
0
0
72] Properly save right con
t
ent from textual viewers
.
commit
|
commitdiff
|
tree
2013-05-16
A
x
el Richard
Renam
e
SubDiffE
l
ementsFilter as Cascadi
n
g
Differ
e
ncesFilter
commit
|
commitdiff
|
tree
2013-04-30
Axel Ric
h
ard
[406310] Item doe
s
n't
c
ol
l
apse after slecting a new
.
.
.
commit
|
commitdiff
|
tree
2013-04-30
Axel Richard
[
40
6
513] Define a lab
e
l
of 42 whitespaces t
o
mak
e
the
.
.
.
commit
|
commitdiff
|
tree
2013-04-29
Axel Richard
[406539] - NPE
w
hen
using groups
commit
|
commitdiff
|
tree
2013-04-25
Axel Richa
r
d
[406540] - Dif
f
n
ot selected
in cont
e
nt
viewers
commit
|
commitdiff
|
tree
2013-04-24
Axel Rich
a
r
d
[406401] Fix b
u
g in SingleStr
u
cturalFeatureAccess
o
r
Impl
.
.
.
commit
|
commitdiff
|
tree
2013-04-24
Axel Richar
d
I
m
p
r
o
ve Resourc
e
AttachmentChangeMergeViewerIte
m
#
getChil
d
ren()
commit
|
commitdiff
|
tree
2013-04-24
Axel Richard
Manage case
o
f
a
ncestor
i
n
R
e
source
C
ontentsAccessorI
m
pl
.
.
.
commit
|
commitdiff
|
tree
2013-04-23
Axel Richard
[405720] Undo doe
s
n't work aft
e
r a
m
erge
commit
|
commitdiff
|
tree
2013-04-22
A
xel Richard
[406201] - Diff not selecte
d
i
n TreeViewer
commit
|
commitdiff
|
tree
2013-04-22
Axel Richa
r
d
Manage cas
e
of ancestor i
n
Mat
c
h
Accessor#
g
e
tItems()
.
commit
|
commitdiff
|
tree
next