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
[443330] Avoid getting a "Profile version change" error.
2014-07-07
A
xel
Richard
FeatureM
a
ps:
FeatureMapChanges tests
commit
|
commitdiff
|
tree
2014-07-07
A
x
el Richard
A
d
d new UI
filte
r
: Featur
e
Map entri
e
s
commit
|
commitdiff
|
tree
2014-07-07
Axel Richard
Add default meth
o
ds
i
m
plement
a
tion i
n
Ab
s
t
r
actDi
f
ferenceGrou
.
.
.
commit
|
commitdiff
|
tree
2014-07-07
Axel Richa
r
d
Fe
a
tureMaps: Handle Featu
r
eMapChange differ
e
nces
commit
|
commitdiff
|
tree
2014-07-03
Axel Richard
Feat
u
reMaps: Add new Diff
:
FeatureMapCh
a
nge
commit
|
commitdiff
|
tree
2014-07-01
A
x
e
l
Richard
[
43
7
811] Undo merge changes the way of consequences
.
.
.
commit
|
commitdiff
|
tree
2014-06-20
Axel RICH
A
RD
Merge "avoid failu
r
es compari
n
g
f
iles
at reposi
t
ory
.
.
.
commit
|
commitdiff
|
tree
2014-06-20
Axel R
i
c
hard
EMF Compare doc: A
d
d tu
t
orial t
o
index
commit
|
commitdiff
|
tree
2014-06-03
Axel Ric
h
a
rd
[4
3
525
1
] [435252] Update doc fo
r
Luna
commit
|
commitdiff
|
tree
2014-05-28
Axel Richar
d
[4348
2
8] Test
M
er
g
e Con
f
li
c
t
Diff With
Con
f
lict
i
n
g
.
.
.
commit
|
commitdiff
|
tree
2014-05-27
Axel Rich
a
rd
[435743] Fix Diagrams nod
e
are not
displ
a
yed any
m
ore
.
.
.
commit
|
commitdiff
|
tree
2014-05-26
Axel Richar
d
[43
5
617] Fi
x
Struct
u
re Merge View
e
r
content with refin
e
d
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Axel
R
ichard
[431882] Fix IllegalS
t
ateException in case
o
f Pseudo
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Axel Richard
[435
0
5
3]
Add
P
seudo confli
c
t
s
tests
.
commit
|
commitdiff
|
tree
2014-05-21
Axel Richard
[435376] Con
f
l
icted subdiffs shouldn'
t
b
e merged when
.
.
.
commit
|
commitdiff
|
tree
2014-05-20
A
x
el R
i
chard
[434866
]
R
eal Add Conflict Displa
y
commit
|
commitdiff
|
tree
2014-05-07
A
x
el Richar
d
[434200] A
c
cept/Reject diff
e
renc
e
f
ails
i
n
so
m
e cases
commit
|
commitdiff
|
tree
2014-05-06
A
x
el Richard
[434165] Mark consequ
e
n
c
es as merge
commit
|
commitdiff
|
tree
2014-05-06
A
x
e
l
R
i
c
h
a
r
d
[
4
31643] Fix
Manage ca
s
e of no
s
e
lec
t
ed it
e
m
.
commit
|
commitdiff
|
tree
2014-05-05
Axel Richar
d
[431643] Fi
x
Manage case of
n
o
selected item
.
commit
|
commitdiff
|
tree
2014-05-05
Axel Richard
A
dd pse
u
do conflic
t
d
iffs
to the required c
o
nseq
u
e
nces
.
.
.
commit
|
commitdiff
|
tree
2014-05-05
A
xe
l
R
i
chard
Display
D
ropdown merge
menu ac
t
ions lab
e
ls
commit
|
commitdiff
|
tree
2014-04-28
Axel Richard
[
431643] Manage
c
ase
o
f no selecte
d
item
.
commit
|
commitdiff
|
tree
2014-04-28
Axel Richar
d
[431643] Man
a
ge
c
as
e
s of no differences a
n
d no
visible
.
.
.
commit
|
commitdiff
|
tree
2014-04-17
Axel Richard
A
dd equivale
n
ces to the
req
u
ired cons
e
quences
s
hown
.
.
.
commit
|
commitdiff
|
tree
2014-04-09
Axel Richard
normalize EO
L
s
in the core
(
third pass)
commit
|
commitdiff
|
tree
2014-04-09
Axel Richard
[432014] Toolbar ap
p
e
ars twice after save
commit
|
commitdiff
|
tree
2014-04-09
Axel Richard
[432002] Undo
doesn't updat
e
content vie
w
ers & m
e
rge
.
.
.
commit
|
commitdiff
|
tree
2014-04-09
Axel Richard
[
43214
1
]
Conflict
s
diffs
or
d
e
r ch
a
nge be
t
ween
c
o
mparisons
commit
|
commitdiff
|
tree
2014-04-01
Axel
Rich
a
rd
[431693] The
a
c
tive group pr
o
vider is not selected
.
.
.
commit
|
commitdiff
|
tree
2014-03-31
A
xel Richar
d
[4
3
149
5
]
Chang
e
Group
P
r
ovider
must select
t
h
e fir
s
t
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Axel Rich
a
rd
[406516] Manage Parameterized Types in Comparison
commit
|
commitdiff
|
tree
2014-03-28
Axel Richard
[4
3
0
6
97] Toolbar ap
p
ears twice when Replace With action
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Axel Richard
Fix typo
for
Compa
r
e With Each
O
ther in Dialog/E
d
itor
commit
|
commitdiff
|
tree
2014-03-28
A
x
e
l
R
i
chard
[429256] Includ
e
read onl
y
workspace res
o
u
rc
e
s in scope
commit
|
commitdiff
|
tree
2014-03-28
Ax
e
l
R
ichar
d
[
4
184
7
2] Cannot merge
a move
f
rom neste
d
Classi
f
ier
.
.
.
commit
|
commitdiff
|
tree
2014-03-27
Axel Richard
Update Luna tar
g
et file to M6
commit
|
commitdiff
|
tree
2014-03-26
Axel Richard
[428916] Rejecting addition with local hist
o
ry doesn
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
Axel R
i
c
h
ard
[406439] EMF Compa
r
e d
o
es not sup
p
ort list wi
t
h
n
u
ll
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
Axel Richard
[417360]
NPE w
h
en
c
omparing
R
esources not c
o
ntained
.
.
.
commit
|
commitdiff
|
tree
2014-03-24
A
x
el Richard
[4289
1
8
] Fi
x
"Replace with" previ
e
w is broken
by EMF
.
.
.
commit
|
commitdiff
|
tree
2014-03-24
Axel Richard
I
n
c
rease tar
g
e
t
pl
a
tf
o
rm DSL files
v
ersion to 2
.
0
.
1
commit
|
commitdiff
|
tree
2014-03-13
A
xel Richard
[429123] SWTException in
T
ableMergeViewer when
c
hanging
.
.
.
commit
|
commitdiff
|
tree
2014-03-13
A
xel R
i
char
d
[
4
29122] W
r
ong label use
d
in
S
t
ructureMerge
V
iewer
commit
|
commitdiff
|
tree
2014-03-13
Axel Richard
Fix broken links in developer guide
commit
|
commitdiff
|
tree
2014-03-10
Axel R
i
chard
Fix wrong keys
w
hen put WeightProvid
e
r in Regist
r
y
commit
|
commitdiff
|
tree
2014-03-10
Axel Richard
Improves
p
erformances
o
f
WeightProv
i
de
r
Registry
commit
|
commitdiff
|
tree
2014-03-10
Axe
l
Ric
h
ard
Add W
e
ightProvider
Re
g
i
s
try
commit
|
commitdiff
|
tree
2014-03-07
Axel Richard
Update RC
P
UI extension poin
t
s
references in
user
.
.
.
commit
|
commitdiff
|
tree
2014-03-07
Ax
e
l Richard
M
o
ve AbstractTypedEle
m
entAdapter AP
I
from p
r
ovisional
.
.
.
commit
|
commitdiff
|
tree
2014-03-07
Axel Richard
U
p
dat
e
RCP UI extension points informations
.
commit
|
commitdiff
|
tree
2014-03-05
A
x
e
l
Rich
a
rd
Fix
b
roken l
i
nks in
o
.
e
.
emf
.
compare
.
d
o
c/FAQ
commit
|
commitdiff
|
tree
2014-03-05
A
x
el Ric
h
a
r
d
Fix
typ
o
in MatchE
n
gine
F
ac
t
oryRegistryWrapper name
commit
|
commitdiff
|
tree
2014-02-26
Axel Richard
M
e
rge
r
em
o
te-tracking branch 'eclipse
/
master' into
.
.
.
commit
|
commitdiff
|
tree
2014-02-26
A
x
el Richard
A
dd LogicalMod
e
lTe
s
t
t
o the Suite
commit
|
commitdiff
|
tree
2014-02-25
Axel Richard
Improves updateChan
g
ed
D
epe
n
dencies
(
)
i
n
ProjectModel
R
esolver
commit
|
commitdiff
|
tree
2014-02-19
Axel Richar
d
C
h
ange seconds to m
i
lliseconds for system time measures
commit
|
commitdiff
|
tree
2014-02-18
Axel Richard
Add headline in csv file
if doesn't exists
commit
|
commitdiff
|
tree
2014-02-18
Axel Ric
h
a
rd
Delete csv files fro
m
r
e
po
commit
|
commitdiff
|
tree
2014-02-18
Axe
l
Rich
a
r
d
R
emove LogicalModel te
s
ts f
r
om suite
commit
|
commitdiff
|
tree
2014-02-17
Axel Ri
c
hard
[41816
3
]
M
a
nage d
i
s
play a
n
d merge o
f
UML Stereotype
.
.
.
commit
|
commitdiff
|
tree
2014-02-17
Axel Richard
[418163] U
s
e safe version of eG
e
t and eSet in Me
r
gers
commit
|
commitdiff
|
tree
2014-02-14
A
xel
R
ichard
Up
d
a
t
e pom
.
x
ml (up X
m
x to 2048m)
commit
|
commitdiff
|
tree
2014-02-14
A
x
el Rich
a
r
d
Move merge viewer
r
elated API
from
p
rovision
a
l
t
o public
.
commit
|
commitdiff
|
tree
2014-02-14
Axel Richard
Mov
e
ContentM
e
rgeViewer acc
e
s
s
o
r related API from provisiona
.
.
.
commit
|
commitdiff
|
tree
2014-02-14
Axel
R
ichard
update luna tp
commit
|
commitdiff
|
tree
2014-02-14
Axel
R
i
c
hard
update default steps
number from 5 to 3
commit
|
commitdiff
|
tree
2014-02-13
Axel Richar
d
U
p
date Logical model test, update measures compu
t
i
n
g
commit
|
commitdiff
|
tree
2014-02-13
Axel Richard
Reinit csv files, up
d
a
te
t
p
commit
|
commitdiff
|
tree
2014-02-13
Axel Richard
Remo
v
e
large
m
odel cases from
t
ests
commit
|
commitdiff
|
tree
2014-02-12
Axel Richard
Add
n
ew tests
commit
|
commitdiff
|
tree
2014-02-10
Axel Ri
c
h
a
rd
Ad
d
performance tests plugins
commit
|
commitdiff
|
tree
2014-02-06
Axel
R
ichard
Move filte
r
s & groups related API f
r
o
m
provi
s
ional
.
.
.
commit
|
commitdiff
|
tree
2014-02-01
A
xel Richard
Update target
p
l
a
tform for Luna
M
5
commit
|
commitdiff
|
tree
2014-01-28
Axel
Ric
h
ard
[
426726] A "toString()
"
is r
e
turned fo
r
the l
a
bel of
.
.
.
commit
|
commitdiff
|
tree
2014-01-28
A
xel Ric
h
ard
Impro
v
e perfo
r
manc
e
o
f ProjectMod
e
lR
e
solver
commit
|
commitdiff
|
tree
2014-01-27
A
x
el Richard
Update
Doc & Gendoc
commit
|
commitdiff
|
tree
2014-01-18
Axel Richard
Update user g
u
ide
,
deve
l
oper
g
uide
and sa
m
pl
e
use case
.
commit
|
commitdiff
|
tree
2013-11-19
Axe
l
R
i
c
hard
F
i
x co
n
dition
b
ug
in P
r
oximi
t
y
E
Ob
j
ect
M
at
c
h
e
r#createMatches
commit
|
commitdiff
|
tree
2013-11-12
A
xel
Richard
[4
0
1816]
R
efresh the
workspace a
f
ter
s
avi
n
g the comparison
.
.
.
commit
|
commitdiff
|
tree
2013-11-12
Axel Richa
r
d
[421083] Fix
Dif
f
eren
c
e Group providers are
s
hared
.
.
.
commit
|
commitdiff
|
tree
2013-11-12
Axel Richard
[4210
4
8] Redr
a
w cente
r
p
art of
c
o
ntent
merge
v
iew
e
r
.
.
.
commit
|
commitdiff
|
tree
2013-11-05
Axel
R
ichard
[
4
20705] Fix NPE on compar
i
s
on c
o
n
taini
n
g on
l
y
filtered
.
.
.
commit
|
commitdiff
|
tree
2013-10-30
Axel Ri
c
h
ard
[416413] Fix Difference not selected
in co
n
tent
m
e
rge
.
.
.
commit
|
commitdiff
|
tree
2013-10-20
A
x
el Richard
Fix redraw() not prop
a
g
a
ted
u
nd
e
r windows
commit
|
commitdiff
|
tree
2013-10-20
Axel R
i
ch
a
rd
Improve title mess
a
g
e
: manage pseudo conflicts
d
iffs
commit
|
commitdiff
|
tree
2013-10-18
Axel Ri
c
hard
[406402] - F
i
x con
f
l
i
c
t
s are crea
t
ed after
m
e
r
g
ing
.
.
.
commit
|
commitdiff
|
tree
2013-10-11
Axel R
i
chard
[4
0
5273] - Fix UI does not dete
c
t invalid models
commit
|
commitdiff
|
tree
2013-10-09
Axel
R
ichard
[409004
]
-
F
ix
The 'me
r
ge a
l
l'
action doesn't s
e
t t
h
e
.
.
.
commit
|
commitdiff
|
tree
2013-10-04
Axel Richard
[41860
1
]
- Fix invalid thr
e
ad a
c
ce
s
s when edi
t
i
n
g text
.
.
.
commit
|
commitdiff
|
tree
2013-10-03
Axel Richard
[418600] Fix Undo/Redo m
e
nu items not
a
vailable
commit
|
commitdiff
|
tree
2013-10-03
Axel Richar
d
[41207
5
]
R
estore binary co
m
patibility with Helios
.
commit
|
commitdiff
|
tree
2013-10-02
Axel Richard
Give up
h
an
d
lers/commands - Back to actions
commit
|
commitdiff
|
tree
2013-09-27
Axel Richard
U
p
date Ac
c
eptAll an
d
RejectAll handlers &
com
m
a
n
ds
commit
|
commitdiff
|
tree
2013-09-27
Axel Ri
c
hard
Update UML Spec
i
fic
A
ccessor
s
commit
|
commitdiff
|
tree
2013-09-26
A
xel Richard
[
4169
3
6
]
- UML Refined elemen
t
s f
i
lter chan
g
es d
i
ff
.
.
.
commit
|
commitdiff
|
tree
2013-09-25
Axel Ric
h
ar
d
Update
d
ocumen
t
a
t
ion
.
commit
|
commitdiff
|
tree
2013-09-24
Axel Ri
c
h
ard
[416400] - Fix IOWrappedExceptio
n
by adding a ConflictMe
r
g
e
r
commit
|
commitdiff
|
tree
2013-09-23
Axel RICHARD
M
erge
"
A
dd utility met
h
ods
to MergeViewerSide"
commit
|
commitdiff
|
tree
2013-09-23
Axel RICHARD
Merge "Removed unused
interface
s
"
commit
|
commitdiff
|
tree
next