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
[530250] Fix RecursiveModelMerger to be able to handle Git attributes
2017-02-13
Axel Richard
[508294]
R
esour
c
eA
t
tachme
n
t
C
hange is
d
i
spla
y
ed twice
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-10-24
Axel Richard
[
506344] Multiple Toolti
p
Provider inst
a
ntia
t
ed for
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-10-24
Axel R
i
ch
a
r
d
[506299]
M
atch
N
ode d
i
splays "Match" a
f
ter mer
g
e
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-10-21
Axe
l
Rich
a
r
d
[5
0
1569
]
The cas
c
a
d
ing filter d
o
es not hide mer
g
ed
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-10-13
A
x
el Ri
c
hard
[502836]
U
pdate
MatchAccessor : handle
d
i
ff
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-10-13
A
x
el
R
i
chard
M
i
s
cellaneous Findbugs fixes
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-04-19
Axel Richard
[RCPTT Tes
t
s] simplify
create AUT shel
l
script
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-04-18
Axel R
i
chard
U
p
d
a
te RCP
T
T
T
ests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-04-01
Ax
e
l Ric
h
ard
U
p
date RCPTT test
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-04-01
Axe
l
Rich
a
rd
Update Neon ta
r
get file
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-04-01
Axel Rich
a
rd
U
p
dat
e
Mo
d
elE
x
te
n
si
o
nUtil
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-03-21
Axel Richard
U
pd
a
te
R
CPT
T
tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-12-24
Axel Richard
[
4
71157
]
StackOverflow
i
n
T
hreeWayComparisonGrou
p
Provider
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-12-04
Axel
R
i
c
hard
Ma
k
e do
c
um
e
n
tation less ambiguous
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-28
Axel
Rich
a
r
d
Reve
r
t "[462
8
6
3
] Stagin
g
Prompt
a
fter R
e
sol
v
ing Confli
c
ts"
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-27
Axel
R
ichard
Rever
t
"[48043
7
]
M
is
s
ing Diff i
n
diag
r
am co
n
fl
i
c
t delete
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-27
Axe
l
Ric
h
ard
[480
4
3
7] Missing
D
i
ff in diagram confl
i
ct de
l
ete vs
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-22
A
xel
Richard
[
4
75586] Re
j
ect
s
u
b-diffs of reject
e
d
diffs
when casca
d
ing
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-22
A
xel Richard
[
478539] Refining conflicted
diff doesn
'
t show sub
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-22
Axel Richard
Revert [462863] Staging Prompt after Resolving Co
n
flicts
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-21
Axel Ri
c
hard
[475586] Reject sub
-
dif
f
s
of rejected diff
s
when cas
c
ading
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-21
Axel Ric
h
ard
[475586] Reject sub-d
i
f
fs of reje
c
ted
diffs whe
n
cascading
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-21
Axel
Richard
Add S
W
TBot to Mars Logical
t
arget
p
l
atforms
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-19
Axel
Richard
[
4
75586]
R
ejec
t
s
u
b-diffs of rejec
t
ed diff
s
when ca
s
cading
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-08
Axel Richard
[UI Tests]
U
podate tests after I
m
ple
m
e
n
t
a
tion of contextual
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-01
Axel R
i
c
h
ard
Happy che
c
k
s
tyle
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-30
Axel Richar
d
[UI Tests] - Update RCPT
T
t
ests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-29
Axel Richard
[
47776
7
] Int
r
o
duce new MatchingStrategy for models
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-24
Axel Richard
Revert "[4754
7
3] Prevent IdenticalR
e
sourceMinimize
r
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-24
Axe
l
Ri
c
hard
[46
4
73
9
] ResourceLocationChanges become Reso
u
rcea
t
tachmentCh
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-24
A
x
el Richard
[4762
0
7
] Handle Move
k
ind fo
r
Res
o
u
r
c
eAttachmentChanges
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-24
Axel
R
icha
r
d
Mer
g
e with
n
ew re
m
ote p
r
o
j
ects
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-23
Axel Richard
Fix pote
n
tial NPE in Navigatable
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-23
Ax
e
l
R
ichard
Add RecursiveModelMer
g
e
thro
u
gh EGit
me
r
geStrategy
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-15
Axel
Rich
a
r
d
[
UI Tests]
Upd
a
te RCPTT tests
commit
|
commitdiff
|
tree
2015-09-11
Axel Richar
d
T
aking into acco
u
nt
n
e
w
EGi
t
pr
e
fe
r
ence about me
r
ge
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-04
Axel
Richard
Re
v
e
r
t
commit
f
f36e
c
9 A
d
d Recur
s
iveMode
l
Merge through
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-03
Axel
Richard
Fix RCPTT test
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-03
Axe
l
Richard
Add o
.
e
.
e
.
c
.
ide
.
tes
t
s to pom
.
xml pare
n
t
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-01
Axel Richard
U
pdat
e
RCPTT tests plugin pom
.
xml
commit
|
commitdiff
|
tree
2015-09-01
Axel Richar
d
Update RC
P
TT tests plugin pom
.
xml
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-01
Axel Ric
h
ar
d
Update RCPTT tests pl
u
gin
p
om
.
xml
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-08-31
Axel Richard
Update RCPTT pom
.
x
ml
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-08-31
A
x
e
l Richard
U
p
d
ate RCPTT tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-08-31
Axel Ri
c
hard
Up
d
ate
RCPTT
E
git tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-08-06
Axel
R
i
c
ha
r
d
[UI Test] f
i
x
luna prof
i
le in pom
.
xml
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-07-30
Axel Richard
Up
d
ate ch
e
ck
s
tyle rul
e
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-07-15
Axel
R
ichar
d
Ne
w
EMF Compare
s
p
ecific
a
tions pl
u
g
in
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-07-10
Axel Ric
h
ard
[
UI Tests] U
s
e RCPTT runner & maven plugins 2
.
0
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-07-10
Axel Ric
h
a
rd
[UI Test
s
] RCPTT - U
s
e Mars R release in Mars profile
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-07-09
Axel R
i
chard
[47
0
398]
F
ix NP
E
in EM
F
CS
t
ructureMerge
V
iewerConte
n
t
Provider
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-07-07
A
x
el
R
icha
r
d
[470503] Som
e
cascading dif
f
s not me
r
ged with menu
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-07-07
Axel Richard
U
p
date M
a
rs TP
s
w
it
h
jd
t
.
annotation pl
u
gin
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-22
Axel Richa
r
d
[453
4
08] Fix SWTExce
p
t
i
on in EMFCSMV#internalRedraw()
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-22
Ax
e
l
R
i
c
hard
[
470396] Fix
N
PE in C
o
mpareToolBar#setE
n
ab
l
ed(
b
oo
l
ean)
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-18
Axel Rich
a
rd
[RelEng
]
Upd
a
te tycho from
0
.
21 to
0
.
2
3
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-18
Axel
Richard
[Rel
E
ng] Update jarsigner version
from
1
.
0
.
5 to 1
.
1
.
2
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-18
A
x
el Richard
F
i
x UM
L
DanglingSt
e
reot
y
peApplication detec
t
ion
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-18
Axe
l
Richard
[Tes
t
s] Add te
s
ts f
o
r new UML dangling Stereotype App
l
icatio
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-18
Axel Richard
Add
n
e
w
UML DanglingStereot
y
peApplication co
n
cept
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-17
Axel Rich
a
rd
[469355] Fi
x
conflicts label shows wr
o
ng number of
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-17
Axel
R
i
cha
r
d
[UI Tes
t
s
]
Update pom
.
xml
(RCPTT migrati
o
n)
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-17
Axel
R
ichard
[UI Tests] U
p
date pom
.
x
ml (RCPT
T
migration)
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-17
A
x
e
l Richard
[UI
T
ests
]
Move fro
m
Q7 to
RCPTT
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-15
Axel
R
ichard
[458961] Fix Coordinate
s
change co
n
t
a
ins diffs
f
rom
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-11
Axel Richard
[UI Tests]
Update
t
ests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-10
Axel Richa
r
d
[UI Test
s
] Update test
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-10
Axel R
i
ch
a
r
d
[
4
6
92
3
7
] Me
r
g
e
Refining diffs if all ref
i
ned diffs
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-10
Axel Ric
h
ard
[
4
59131] Fix Re-connect c
h
an
g
ed reso
u
r
ces
& ra
n
dom
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-10
Axel R
i
chard
Bump feature
v
ersions to 3
.
2
.
0 on master
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-10
A
x
el
Ric
h
ard
[UI Tests] U
p
date Mars
c
o
nfig
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-10
Ax
e
l Richard
[UI]
Upd
a
te TP for Mars
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-08
Axel Richard
[Doc
]
Update u
s
e
r
-guide
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-08
Ax
e
l Richard
[Doc]
U
p
d
ate
generated qu
a
lified ver
s
ion f
o
r we
b
site
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-05
Axel Richard
[UI Tes
t
s
]
Upda
t
e
Mars from RC2
t
o RC3 fo
r
Q7 test
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-01
A
x
el Richard
Updat
e
all
TPs with la
t
est Orbit release
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-01
A
xe
l
Richard
[4
6
874
0
] Fix
B
y
Side G
r
oup P
r
ovider
:
Left Side
Group
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-01
Axe
l
Rich
a
rd
[468
9
13] Fix NPE in Papyr
u
sDiagram
3
Wa
y
DiffHandler
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-29
Axel
R
ichar
d
H
a
p
py
C
heckst
y
l
e
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-28
Axel Richard
Adds
Q
7
test for UML profiles
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-28
Axel Richard
Fix ty
p
o
s in core
sdk & egit sdk featu
r
e names
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-27
A
xel Richard
[467684] F
i
x Compar
e
Tool
b
a
r
is graye
d
out af
t
er
saving
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-27
Axel Ric
h
ard
[4682
6
7]
F
ix NPE in
E
MFCompar
e
Diff
T
reeRule
r
#fi
n
dFirstAncesto
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-26
Axel
R
ichard
[467
6
68]
F
ix Accept/Reject All
b
ut
t
ons behavi
o
ur wi
t
h
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-26
Axel Richard
[UI T
e
st
s
] Update shell script to
u
se Eclipse Mars
.
.
.
commit
|
commitdiff
|
tree
2015-05-18
Axel Ric
h
ard
Fix ThreadedModelResolver
init
i
alization
o
n performances
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-18
Axel Richard
[Doc] Update
user
g
uid
e
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-13
Axel Richard
[45897
1
] Fix
i
nfinite loop in
G
raph
.
BreadthFirstIterator
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-11
Axel Ri
c
hard
[UI Tes
t
s] Add E
M
Compar
e
EGit fea
t
ure to ma
r
s profile
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-11
Axel Richard
[UI
T
ests] Use Mars M7 i
n
A
UT cr
e
ation
script
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-11
Axel Rich
a
rd
Update mar
s
-sdk target plat
f
orm f
o
r Mars M7
commit
|
commitdiff
|
tree
2015-05-06
Axel Ric
h
ard
[UI
T
ests] - Update Q7 Tes
t
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-06
Axel Richard
[UI Tests
]
- U
p
date Q7 Tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-05
Axel
R
ichard
[
4
63785] Resour
c
eLo
c
a
t
ionC
h
an
g
e: UI cha
n
ges
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-05
Axel Richard
[46
3
785] Re
s
ourceLoc
a
tionChange: core changes
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-27
Axel Richard
[
4637
8
5] A
d
d
new concept in
E
MF Co
m
p
a
re:
R
e
so
u
rceLocatio
n
Change
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-17
Axel R
i
chard
Fix U
n
suppo
r
tedOperationExcept
i
o
n
in T
h
read
e
dModelResolver
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-16
Axel Richard
[464
6
13] Che
c
k i
f
URIs e
x
ist in the mo
d
e
l dependen
c
y
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-14
A
x
el Richard
[UI Tests] Update ui
t
ests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-14
Axe
l
Rich
a
rd
[4
6
4379] Matchin
g
reso
u
rces shou
l
d
use id strategy
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
next