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
Bump version to 3.3.18
2021-01-07
Axe
l
RICH
A
RD
Fix potent
i
al NPE
Signed-off-by:
Axel RICHARD
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2019-07-16
Ax
e
l Ri
c
hard
A
ctivation of all Git test
s
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2017-02-13
Axel R
i
ch
a
r
d
[508294] Resou
r
ceAtt
a
chmentCh
a
nge
is displayed twice
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-10-24
Axel Richa
r
d
[506344] Multiple Toolti
p
P
rovi
d
er instantiated
fo
r
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-10-24
Axel Richard
[506299]
M
a
t
ch Node
d
i
splays "Match"
after
me
r
ge
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-10-21
Axel Richard
[501569
]
The cascading fil
t
e
r does
n
ot hi
d
e merged
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-10-13
Axel Rich
a
rd
[5
0
2836
]
Up
d
ate Mat
c
hAccessor : handle diff
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-10-13
A
x
el Richard
Miscella
n
eous Findb
u
gs
fix
e
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-04-19
Axel Richard
[RCP
T
T Test
s
]
simplif
y
create AU
T
s
h
e
ll script
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-04-18
Ax
e
l R
i
c
hard
Upd
a
te RCPT
T
T
e
s
t
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-04-01
Axel Richard
U
p
date RCPTT tes
t
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-04-01
A
xel Richard
Up
d
a
t
e Neon t
a
rget file
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-04-01
Axel Richard
Update Mod
e
l
E
xten
s
ionUtil
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-03-21
Axel Richard
U
p
date RCPTT
tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-12-24
A
x
e
l Ric
h
ard
[
47
1
157] S
t
a
ckOverflow in ThreeWay
C
omparisonGroupProv
i
der
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-12-04
Axel Richard
Make documentation less ambiguous
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-28
Axel Ri
c
hard
Revert "[462863] Staging Prompt
after Resolv
i
ng Conflicts"
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-27
Axel Richard
Re
v
ert "[48
0
437] Missin
g
Diff in diag
r
am confl
i
ct delete
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-27
A
x
el Rich
a
rd
[48
0
437] Mis
s
i
n
g Diff in diagra
m
conflict del
e
te vs
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-22
Axel Ri
c
hard
[475586] Reject sub-diffs of rejected d
i
ffs when c
a
sc
a
ding
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-22
Axel Rich
a
rd
[478539] Refining conflicte
d
diff
d
o
esn
'
t show sub
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-22
Axel Richard
Revert [46286
3
] Sta
g
ing Promp
t
a
ft
e
r Resolving
Co
n
f
licts
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-21
A
xel Ri
c
hard
[475586]
Reject sub-diffs of reject
e
d diffs when casca
d
i
n
g
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-21
Axel Ric
h
ard
[
475586] Reject sub-diffs of rejected d
i
ffs when cascadi
n
g
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-21
Axel Richar
d
A
d
d SWTBot
t
o Mars Logical tar
g
et pl
a
tform
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-19
Axel
Richar
d
[4
7
5586] Rej
e
ct sub-diffs o
f
reject
e
d di
f
fs when cascading
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-08
Axel Richard
[UI Tests] Upodate
tests af
t
er Im
p
l
e
mentation of
c
o
nt
e
xtual
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-01
Axe
l
R
ichard
H
a
ppy checks
t
y
le
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-30
Axel Ric
h
ar
d
[UI Tests] - Update RCP
T
T tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-29
Ax
e
l Richard
[477
7
6
7
] Introduc
e
new
MatchingStrategy for mode
l
s
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-24
Axe
l
Richard
Revert "[475473] Prevent IdenticalResourc
e
M
i
nimizer
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-24
A
x
el Richard
[464739] Resour
c
eLocatio
n
C
ha
n
ges beco
m
e R
e
sourceattac
h
me
n
tCh
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-24
Axel Ric
h
ard
[476207]
H
andle Move
k
ind for Reso
u
rc
e
A
t
tachmentC
h
a
nges
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-24
Axe
l
Richard
M
e
rge w
i
th new remote project
s
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-23
Axel Richard
F
i
x p
o
tential
NPE in N
a
vigatable
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-23
Axel Richar
d
Add Recursi
v
eModelMerge throu
g
h
EGi
t
m
e
rgeStrategy
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-15
Axel Richard
[UI Tes
t
s] Update
RC
P
T
T
test
s
commit
|
commitdiff
|
tree
2015-09-11
Axe
l
Ri
c
h
a
rd
Taking i
n
t
o account new
E
Git preference about merge
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-04
Axel Ric
h
ard
R
e
ve
r
t
commit ff36ec9 Add
R
ecursiveMode
l
Me
r
ge t
h
rough
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-03
Axel Richard
Fi
x
R
CP
T
T test
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-03
Axel Rich
a
rd
Ad
d
o
.
e
.
e
.
c
.
ide
.
tests
t
o
pom
.
xml parent
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-01
Axel Richard
Update RCPTT tests
plu
g
in pom
.
x
m
l
commit
|
commitdiff
|
tree
2015-09-01
A
xel Richard
U
pdate RC
P
TT te
s
ts pl
u
gin pom
.
x
m
l
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-01
A
x
e
l Richard
Updat
e
R
C
PTT tests
p
lugin po
m
.
xml
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-08-31
Ax
e
l Richard
Update RCPT
T
pom
.
xml
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-08-31
Axel
R
ichard
Upd
a
te RCPTT
t
ests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-08-31
Axel Richard
Update
R
CPTT Egi
t
tes
t
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-08-06
Axe
l
Ric
h
ard
[
UI Test]
f
i
x luna prof
i
le
i
n p
o
m
.
xml
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-07-30
A
xel Richard
Update checkstyle rule
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-07-15
Axel Richard
N
e
w
E
MF Compare specificat
i
o
n
s
p
lug
i
n
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-07-10
Axel
R
i
c
h
ard
[UI Tests] Use
R
C
P
TT
r
unner &
m
aven plugi
n
s 2
.
0
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-07-10
Axel Rich
a
rd
[UI T
e
s
t
s] RC
P
TT
-
Us
e
Mars R rele
a
se in
M
ars profile
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-07-09
Axel R
i
char
d
[470398] F
i
x NPE in EMFC
S
tru
c
ture
M
ergeViewe
r
ContentProvider
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-07-07
Axel
R
ichard
[470
5
03] So
m
e cascading diffs
n
ot merg
e
d wi
t
h
me
n
u
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-07-07
A
xel Richard
Upda
t
e Ma
r
s
TPs
with
j
dt
.
a
nnota
t
i
on plugin
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-22
Axel Richar
d
[45
3
408] Fix SWTException i
n
EMFCSMV#i
n
t
ernalRe
d
raw()
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-22
Axel Richard
[470396] Fix NPE i
n
CompareToolBar#setEn
a
bled
(
boolean)
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-18
Axel Richard
[RelEng] Update tycho fro
m
0
.
2
1 to 0
.
23
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-18
A
xel Richa
r
d
[RelEng] Update ja
r
signer version from 1
.
0
.
5 to 1
.
1
.
2
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-18
Ax
e
l Ric
h
ard
Fix UML
D
anglingStere
o
typeAp
p
lication det
e
c
tion
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-18
Axel Richard
[Tests] Add t
e
sts for new UML dangling Stereotype Applicatio
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-18
Axel Richard
A
dd
n
ew UM
L
DanglingStereotyp
e
Applicat
i
on
concept
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-17
Axel Richard
[
469355] F
i
x conflicts label shows
w
r
ong numb
e
r of
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-17
Axel Richard
[
UI Tests] Update pom
.
xml (RCPTT migration)
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-17
Axel Richard
[UI Tests] Up
d
a
t
e
pom
.
xml
(RC
P
TT mi
g
ration)
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-17
Axel
Richard
[UI Tests] Move from
Q
7
to RCPTT
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-15
Axe
l
Richard
[458961] Fix C
o
ord
i
nates change contains diffs from
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-11
Axel Richard
[UI Tests] Update t
e
sts
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-10
Axel Richard
[
U
I
Tests] Up
d
ate
t
ests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-10
Axel Richard
[46
9
237] Merge
R
efining diffs
i
f all refined diffs
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-10
Axel
R
icha
r
d
[
459131] Fix Re-connec
t
change
d
resource
s
&
r
andom
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-10
Axel
R
i
c
ha
r
d
Bump
f
eatur
e
ver
s
ions to 3
.
2
.
0 o
n
m
as
t
er
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-10
A
xel Richard
[
U
I Tests] Update Mars config
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-10
Axel Richard
[
U
I]
U
pda
t
e
TP
f
or Mars
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-08
Axel Ric
h
ard
[Do
c
] Update use
r
-
g
uide
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-08
Axel Richard
[
D
oc]
U
pdate gener
a
te
d
qualif
i
ed version for webs
i
t
e
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-05
Axel Richard
[UI T
e
sts] Update Mars fr
o
m RC2 to RC3 for Q7
tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-01
Ax
e
l Richard
Update all
TPs
with
latest
O
rbit release
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-01
Axel Richard
[
4
687
4
0] Fix By Side Group Provider
:
Left Sid
e
Group
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-01
Axel
R
ichar
d
[468913] Fix
N
PE in PapyrusDia
g
ram3Way
D
i
f
fHandler
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-29
Axel Ri
c
har
d
Happy
C
heckstyle
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-28
A
xel Ri
c
hard
Ad
d
s Q7
t
est f
o
r UML profiles
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-28
Axe
l
Ric
h
ard
F
i
x
t
y
p
o
s
in cor
e
sdk & e
g
it sdk
f
eature names
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-27
Axel Richard
[467684
]
F
i
x
C
ompa
r
eToolbar i
s
grayed out after sa
v
ing
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-27
A
x
el Richard
[468267] Fix NPE in EMFCo
m
pareDi
f
fTreeRuler#fi
n
d
F
irstAnce
s
t
o
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-26
A
x
el
Richard
[
4
6766
8
] Fix Accept/Rej
e
ct All buttons be
h
aviour wi
t
h
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-26
Axe
l
Richard
[UI T
e
sts]
U
pdate shell scrip
t
to use Ecl
i
pse Mar
s
.
.
.
commit
|
commitdiff
|
tree
2015-05-18
Axel Richa
r
d
F
ix
ThreadedM
o
delResolver initia
l
ization on
p
erforman
c
es
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-18
Axel
R
ichard
[Doc
]
Update
user guide
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-13
Axel Richard
[458971] Fix
i
nfin
i
te loop in
Gr
a
p
h
.
BreadthFirstIterator
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-11
Axel Ri
c
h
a
rd
[UI Tests]
A
dd EM Compare
E
Git
f
e
ature to mars profile
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-11
A
x
el
R
ichard
[UI Tests] Us
e
Mars M7 i
n
AUT creation script
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-11
A
x
el Richard
Update ma
r
s-sdk
t
a
r
get platform fo
r
Mars M
7
commit
|
commitdiff
|
tree
2015-05-06
Axel Richard
[
U
I Te
s
ts] - Update Q7 Tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-06
Axel
R
icha
r
d
[
UI
Tests] - Up
d
ate Q7 Tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-05
Axel Richar
d
[
4
63785] Resourc
e
LocationCh
a
nge: UI changes
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-05
A
xel Ric
h
ard
[463785] R
e
sour
c
eLocationC
h
an
g
e: core changes
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-27
Ax
e
l Richard
[463785] Add ne
w
c
o
ncept
in
EMF Com
p
are: Re
s
ourceLocationChange
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-17
Axel Richard
F
i
x Un
s
uppo
r
ted
O
perationExcepti
o
n in Threaded
M
odelRe
s
o
lve
r
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-16
Axel Rich
a
rd
[4
6
4613] Check
if URIs exist in the model de
p
e
ndency
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
next