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
Properly dispose our group providers
2014-12-09
A
x
el RICHARD
Merge
"Remove useless c
o
mparison fie
l
d"
commit
|
commitdiff
|
tree
2014-12-09
Axel Ri
c
h
a
rd
[
U
I
T
es
t
s] R
e
v
e
rt up
g
ra
d
es
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Axel Ric
h
ard
Upda
t
e
q7 tests
commit
|
commitdiff
|
tree
2014-12-09
Axe
l
Richard
[
U
I Tests] F
i
x
NoClassDefFound:
o
rg/sonatype/aether
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Ax
e
l
R
ichar
d
[UI
Tests] Update pom
.
xml & cre
a
t
e
AUT
.
s
h
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-07
Ax
e
l Richard
[
453
4
32] Add first use bug to the known limitati
o
n
s
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-05
Axel Richard
[4
4
28
9
8] Add confl
i
ct: content merge vi
e
w
er displays
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-05
Ax
e
l R
i
c
h
ard
[E
M
F Compare CLI]
Add g
i
t logicalpull section in do
c
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-04
Axel
R
i
chard
[442897] Pseudo con
f
licts under Real Add conflicts
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-24
Axel Ric
h
a
rd
Ad
d
new Logic
a
l
M
odel View section i
n
U
ser guide
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-24
Axe
l
Richard
Logic
a
l Model View: new UI test
c
as
e
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-24
Axel Richard
Lo
g
ical Model View: recomputes after resolution
s
c
o
p
e
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-19
Axel Richard
Logic
a
l
Model View:
handle models with errors
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-19
Axel
R
ich
a
r
d
Po
p
ul
a
te Lo
g
ic
a
l Mod
e
l V
i
e
w
w
h
en synchronizati
o
n but
t
o
n
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-07
Ax
e
l Richard
[44
9
1
6
2] F
i
x IllegalStateException: Th
e
re
s
o
urce set
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-05
Axe
l
Richard
Add new
Git command
s
i
n
volving model
s
page
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-05
A
x
el Rich
a
rd
Ad
d
UI test
f
o
r Lo
g
ical Model Vi
e
w
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-05
Axel Richard
New Logical
M
odel
View
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-05
Axel
R
ICHARD
Merge "UI tests:
U
pdate differe
n
ces ord
e
r"
commit
|
commitdiff
|
tree
2014-10-09
Axel Richar
d
[4436
9
5]
U
pdate Conflict I
c
on & Lab
e
l
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-10-08
Axel
R
ichard
[439036]
F
e
a
tureMap filt
e
r s
h
o
u
ldn't h
i
de diffs with
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-10-08
Axel
Richard
Fix missing comma in build
.
proper
t
ies
o
f doc p
l
ugin
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-10-02
A
x
el
Richard
Bumping
mi
n
or fo
r
al
l
p
l
u
gi
n
s
/featur
e
s changed sin
c
e
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-25
Axel R
i
chard
[4
4
2887] Protect compare actions from over-enthusiast
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-25
A
x
el Richard
[443031]
Fix NPE on
F
eatureFilte
r
.
referenceI
s
S
e
t
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-25
Axel Richar
d
[443968]
Fi
x
NPE in
Co
m
parisonUtils
.
getSubDiffs
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-25
A
xel Richard
[404811]
E
x
pand group item o
n
do
u
ble-
c
l
ick
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-25
Axel Richard
[441754] T
h
e default a
c
tiv
a
ted group is buil
t
twice
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-25
Axel Richard
[443696] A
d
d cont
e
xtual
menu o
n
differences in SM
V
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-19
Axel Ric
h
ard
[4
4
43
5
1] Fix bug
i
n
E
qualityHelper
.
match
i
ngArray
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Axel
Richar
d
Fe
a
tureMap
s
: Feature
M
a
pChanges tests
commit
|
commitdiff
|
tree
2014-07-07
Axel
Richard
Add new UI
filter: Fea
t
ureMap entries
commit
|
commitdiff
|
tree
2014-07-07
Axel R
i
c
har
d
A
dd default
methods implementati
o
n in Abst
r
actDi
f
fer
e
n
c
eGro
u
.
.
.
commit
|
commitdiff
|
tree
2014-07-07
A
x
e
l Richar
d
Feature
M
aps: Handle FeatureMapChange dif
f
e
r
enc
e
s
commit
|
commitdiff
|
tree
2014-07-03
Axel Richard
FeatureMaps: Add new
Diff
:
FeatureM
a
pChan
g
e
commit
|
commitdiff
|
tree
2014-07-01
Axel Richard
[43
7
811] Und
o
merge changes th
e
way of consequences
.
.
.
commit
|
commitdiff
|
tree
2014-06-20
Ax
e
l RICHA
R
D
M
e
rge "avoid failures com
p
a
r
ing file
s
at re
p
ository
.
.
.
commit
|
commitdiff
|
tree
2014-06-20
Ax
e
l Ri
c
hard
EMF Compare doc: Add tutorial to inde
x
commit
|
commitdiff
|
tree
2014-06-03
Ax
e
l Richard
[435251] [435252] Update
d
oc for Lun
a
commit
|
commitdiff
|
tree
2014-05-28
Axel
R
ichard
[434
8
28] Te
s
t M
e
rge
Conflict
D
i
ff W
i
th Conflicting
.
.
.
commit
|
commitdiff
|
tree
2014-05-27
Axel R
i
chard
[
4
35743] Fix
D
iagrams
n
o
d
e are not
d
isplayed
a
nymore
.
.
.
commit
|
commitdiff
|
tree
2014-05-26
A
xel Richard
[
435617] Fi
x
Structure Merge Viewer conten
t
with refined
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Axel Ri
c
hard
[4318
8
2] Fix
I
llegalStateE
x
ce
p
tion
i
n
case of Pseudo
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Axel
Rich
a
rd
[
4
3505
3
] Add P
s
eudo conflicts tests
.
commit
|
commitdiff
|
tree
2014-05-21
A
xe
l
Richard
[435376] Co
n
flicted subdiffs shouldn't be
m
er
g
ed
w
hen
.
.
.
commit
|
commitdiff
|
tree
2014-05-20
Axel Richard
[434866] Real
Add C
o
nflict Display
commit
|
commitdiff
|
tree
2014-05-07
A
x
el
R
i
char
d
[4
3
4200] Accept/Reject
d
ifference f
a
ils in
some cases
commit
|
commitdiff
|
tree
2014-05-06
Axel Richard
[434165
]
Mark conse
q
uenc
e
s as mer
g
e
commit
|
commitdiff
|
tree
2014-05-06
Axel Richard
[431643] Fix Manag
e
case of no
s
elected it
e
m
.
commit
|
commitdiff
|
tree
2014-05-05
Axel Richar
d
[43
1
6
4
3] Fix Manage case of no selected it
e
m
.
commit
|
commitdiff
|
tree
2014-05-05
Ax
e
l R
i
chard
Add pseu
d
o con
f
lict diffs to the
r
e
quired consequences
.
.
.
commit
|
commitdiff
|
tree
2014-05-05
Axel Richa
r
d
Display Dropd
o
w
n
merge m
e
nu
acti
o
ns labels
commit
|
commitdiff
|
tree
2014-04-28
Axel Richa
r
d
[43164
3
] Manage
case
o
f
no
s
elected
it
e
m
.
commit
|
commitdiff
|
tree
2014-04-28
Axel
Richard
[431643
]
Manage c
a
ses
o
f
n
o
differ
e
nces a
n
d no
v
i
sible
.
.
.
commit
|
commitdiff
|
tree
2014-04-17
Axel
R
ic
h
ard
Add
e
quivalences to the re
q
uired con
s
equences
shown
.
.
.
commit
|
commitdiff
|
tree
2014-04-09
A
x
el Richar
d
normalize EOLs in the c
o
re (t
h
i
r
d pass)
commit
|
commitdiff
|
tree
2014-04-09
Axel Richard
[
4
3
2
014] Toolbar a
p
p
ear
s
twice a
f
ter sa
v
e
commit
|
commitdiff
|
tree
2014-04-09
Axel Richa
r
d
[432002] Undo doesn't update content v
i
ew
e
rs & merge
.
.
.
commit
|
commitdiff
|
tree
2014-04-09
Axel Richa
r
d
[
4
32141]
Conflic
t
s diffs order
chan
g
e be
t
w
e
en co
m
pariso
n
s
commit
|
commitdiff
|
tree
2014-04-01
A
x
e
l
Richard
[431693] The acti
v
e
group pro
v
ide
r
i
s
no
t
sel
e
c
t
e
d
.
.
.
commit
|
commitdiff
|
tree
2014-03-31
Axe
l
Richard
[431495
]
Change G
r
o
u
p
Provider must select the first
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Ax
e
l
Richard
[406516]
M
anage Para
m
e
te
r
ized Type
s
in Comparison
commit
|
commitdiff
|
tree
2014-03-28
Axel Ri
c
ha
r
d
[
4
30697] Toolbar appears twice when R
e
p
l
a
c
e With action
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
A
xel Ric
h
ard
Fi
x
typo for
Compa
r
e
W
ith Each Othe
r
i
n
Dialog/Editor
commit
|
commitdiff
|
tree
2014-03-28
A
x
e
l R
i
chard
[42
9
256
]
I
n
clude read o
n
l
y
workspace resources i
n
scope
commit
|
commitdiff
|
tree
2014-03-28
A
xel
R
icha
r
d
[4184
7
2] Cannot
m
erge a m
o
ve from nestedClassifier
.
.
.
commit
|
commitdiff
|
tree
2014-03-27
Axel
R
ichard
Update Luna target fil
e
to M6
commit
|
commitdiff
|
tree
2014-03-26
A
x
el
Richard
[428916] Rejecting
addition wit
h
local histo
r
y
do
e
sn
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
Axel
R
i
c
har
d
[
406439] EMF
C
ompare
d
o
e
s not support list with
null
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
A
x
el Richard
[417360] NP
E
wh
e
n
c
omparing Reso
u
rces not conta
i
ned
.
.
.
commit
|
commitdiff
|
tree
2014-03-24
Axel Richa
r
d
[428918
]
Fix "Replace
with" pre
v
iew is broken by E
M
F
.
.
.
commit
|
commitdiff
|
tree
2014-03-24
Axel Ric
h
ard
Incr
e
ase targetplatform
D
SL fi
l
es ve
r
sion to
2
.
0
.
1
commit
|
commitdiff
|
tree
2014-03-13
Axel
Richard
[4291
2
3] SWTException in Tab
l
eMergeViewer when changi
n
g
.
.
.
commit
|
commitdiff
|
tree
2014-03-13
Axel Ric
h
ard
[42912
2
]
Wr
o
n
g
label
used in
StructureMe
r
geViewer
commit
|
commitdiff
|
tree
2014-03-13
Axel
Ri
c
hard
Fix brok
e
n lin
k
s in deve
l
o
per guide
commit
|
commitdiff
|
tree
2014-03-10
Ax
e
l R
i
chard
Fix wrong keys when put WeightP
r
o
vider in Registry
commit
|
commitdiff
|
tree
2014-03-10
Axel Ric
h
ard
I
mproves perfor
m
ances of
WeightProvider Registry
commit
|
commitdiff
|
tree
2014-03-10
Axel Richar
d
Add Weig
h
tProvi
d
e
r
Registry
commit
|
commitdiff
|
tree
2014-03-07
Axel Richar
d
Update RCP
UI extension po
i
nts references in user
.
.
.
commit
|
commitdiff
|
tree
2014-03-07
Axel R
i
c
h
ard
Move Abstr
a
ctTypedElementAdapter API from provisional
.
.
.
commit
|
commitdiff
|
tree
2014-03-07
Axel
R
ichard
Update RCP
U
I
e
x
tensi
o
n points i
n
formations
.
commit
|
commitdiff
|
tree
2014-03-05
Axel Richard
Fix broken l
i
nks in o
.
e
.
emf
.
c
o
mpare
.
doc/FAQ
commit
|
commitdiff
|
tree
2014-03-05
Ax
e
l R
i
chard
Fix typo
in Matc
h
En
g
ineFa
c
toryRegistry
W
rapper name
commit
|
commitdiff
|
tree
2014-02-26
Axel Rich
a
rd
Merge remote-tracki
n
g branch 'eclipse/master' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2014-02-26
Axel Ric
h
ard
A
d
d LogicalModelTest to the Sui
t
e
commit
|
commitdiff
|
tree
2014-02-25
Axel Rich
a
rd
I
m
p
rov
e
s
u
pdat
e
C
h
ang
e
dDependenc
i
es(
)
in ProjectModelRes
o
lver
commit
|
commitdiff
|
tree
2014-02-19
A
x
e
l
Richar
d
Cha
n
ge s
e
conds
t
o mill
i
seconds for system time me
a
sures
commit
|
commitdiff
|
tree
2014-02-18
A
xel
R
ichard
Add headli
n
e in csv
f
ile if doesn't exi
s
ts
commit
|
commitdiff
|
tree
2014-02-18
Axel Richard
Delete csv file
s
from repo
commit
|
commitdiff
|
tree
2014-02-18
Axel Richard
Rem
o
ve Log
i
calModel te
s
ts from suite
commit
|
commitdiff
|
tree
2014-02-17
Axel Richard
[41816
3
] Manage dis
p
lay and merge o
f
UML S
t
ereotype
.
.
.
commit
|
commitdiff
|
tree
2014-02-17
A
x
el Richard
[418163] Use safe version
of eGet and eSet in Mergers
commit
|
commitdiff
|
tree
2014-02-14
Axel Richard
U
p
d
a
te pom
.
xml
(
u
p
X
mx to 2048m)
commit
|
commitdiff
|
tree
2014-02-14
Axel Richard
Move m
e
rge vi
e
we
r
r
e
lated A
P
I from provisional to
p
ubl
i
c
.
commit
|
commitdiff
|
tree
2014-02-14
Axel Richard
M
ov
e
ContentMergeViewer accessor
re
l
ated API fr
o
m provisiona
.
.
.
commit
|
commitdiff
|
tree
2014-02-14
Axel Richard
update l
u
n
a
tp
commit
|
commitdiff
|
tree
2014-02-14
Axe
l
Richard
u
p
d
a
te default step
s
number from
5
to 3
commit
|
commitdiff
|
tree
2014-02-13
Axe
l
Ric
h
ard
Updat
e
Log
i
cal m
o
del te
s
t
,
update me
a
sures computing
commit
|
commitdiff
|
tree
2014-02-13
Axel Richard
Rein
i
t csv files, update tp
commit
|
commitdiff
|
tree
2014-02-13
A
xel
R
ichar
d
Remove large model cases from te
s
ts
commit
|
commitdiff
|
tree
next