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
Make sure folders are created when extracting input files
2019-07-16
A
xel Richard
Activation of all Git
tests
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2017-02-13
Axe
l
Richard
[508294]
ResourceA
t
tachmen
t
Change is
displayed tw
i
ce
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-10-24
Axel
R
i
c
har
d
[
506344] Mu
l
tiple
Too
l
tipProvi
d
er
i
nstantiated f
o
r
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-10-24
Axel Richard
[50
6
299] Match
N
ode dis
p
lays "Match"
a
fter
m
e
rge
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-10-21
Axel Richard
[
5
01569] The cascading fi
l
ter does not hide merge
d
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-10-13
Axel Richard
[502836]
U
pdate
Matc
h
Acce
s
s
o
r :
handle diff
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-10-13
Axe
l
Richa
r
d
Miscella
n
eous Findbugs
fixes
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-04-19
Axel Richa
r
d
[RCPTT Tests] simplif
y
create AUT shell sc
r
i
p
t
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-04-18
Axel R
i
ch
a
rd
Update RCPTT Tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-04-01
Axel Richard
Update RCPTT
tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-04-01
Axel Richa
r
d
U
pd
a
te Neon target f
i
l
e
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-04-01
Axel Richard
U
pd
a
te Mo
d
elE
x
tensionUtil
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2016-03-21
Axel R
i
chard
Update RCPTT tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-12-24
Axel Richard
[
4
7115
7
]
Sta
c
kOverflow in
T
hreeWayComp
a
risonGroupProvider
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-12-04
Ax
e
l
R
ichard
M
a
ke documentation
l
e
s
s ambigu
o
us
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-28
Axe
l
Richa
r
d
Revert "[
4
6
2863] Staging Pr
o
mpt after R
e
solving Co
n
flicts"
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-27
Axel Richa
r
d
Revert "[480
4
37] Mi
s
sing Diff in diag
r
am conflict de
l
ete
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-27
Axel Ric
h
ard
[4
8
0437] Missing Diff in d
i
agr
a
m con
f
lict de
l
ete vs
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-22
Axel Richa
r
d
[
475586]
R
ej
e
ct sub-diffs of rej
e
cted diffs when ca
s
c
a
ding
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-22
Axel
R
icha
r
d
[
47853
9
] Refinin
g
conflicted
d
iff doesn't show sub
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-22
Ax
e
l
Rich
a
rd
Revert [462863] S
t
agi
n
g
Pro
m
pt
a
f
ter R
e
solving Conflic
t
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-21
Axel
R
ichar
d
[4
7
5586] Reject sub-diffs of
r
e
j
ected dif
f
s w
h
en
cascading
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-21
Axe
l
Richard
[475586
]
Reject sub-diffs
of rej
e
cted diffs
w
hen
cas
c
a
d
ing
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-21
A
x
el Richa
r
d
Add SWTBot to Mars Logic
a
l target platfor
m
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-19
Axel Ri
c
hard
[475586
]
R
eject sub-
d
i
f
fs of
r
e
j
ected diffs when cascading
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-08
A
xel Richard
[UI Tests
]
U
p
odate
t
ests after
Imp
l
ementation of contextu
a
l
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-01
Axel Ri
c
hard
Happy
checkst
y
le
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-30
Axel Richard
[UI Tests] - Update RCPTT tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-29
Axe
l
Richard
[477767]
I
ntroduce new MatchingStrategy fo
r
mod
e
ls
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-24
Axel
Richard
R
e
v
ert "[475473] Prevent Ide
n
ticalResourceMinimizer
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-24
Axel Richa
r
d
[464739]
R
e
sourceLo
c
a
t
ionCha
n
ges become
R
esourceat
t
ach
m
en
t
Ch
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-24
Axel Rich
a
rd
[476207] Handle Move ki
n
d
for ResourceAt
t
achmentChanges
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-24
A
x
el Richard
Merge with new re
m
ote pr
o
je
c
ts
Also-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-23
Axel Richard
Fix
p
otential NPE in Navigatable
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-23
A
x
el Ri
c
hard
Add R
e
c
u
r
siveModelMerge th
r
ough EGit
m
ergeStrat
e
gy
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-15
Axel
R
ichard
[UI Te
s
ts] Up
d
a
t
e
R
C
PTT tes
t
s
commit
|
commitdiff
|
tree
2015-09-11
Axel
Richard
Taking into account
n
ew EGi
t
preference a
b
out merg
e
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-04
Axel Richard
Revert com
m
it
f
f36ec9 Add Recursiv
e
ModelM
e
rge throug
h
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-03
Axel R
i
c
h
a
rd
Fix RCPTT tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-03
Ax
e
l Ric
h
ard
Ad
d
o
.
e
.
e
.
c
.
ide
.
tests to pom
.
x
ml paren
t
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-01
Ax
e
l
R
i
chard
Update RCPTT
t
e
sts plugin pom
.
xml
commit
|
commitdiff
|
tree
2015-09-01
A
x
el
R
ichard
U
pda
t
e RCPTT tests plugin pom
.
xm
l
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-01
Axel Richard
Update RCP
T
T tes
t
s p
l
ugin pom
.
xml
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-08-31
A
x
e
l Richa
r
d
Update RCPTT pom
.
xml
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-08-31
Ax
e
l Richa
r
d
Upda
t
e RCPTT t
e
s
ts
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-08-31
Axel Richard
Upda
t
e RCPTT
E
git test
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-08-06
Axe
l
Richar
d
[UI Test] fi
x
luna pr
o
fi
l
e
i
n pom
.
xml
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-07-30
Axel Richard
U
pdate checkstyle
r
ules
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-07-15
A
x
e
l
Rich
a
r
d
Ne
w
EM
F
Compare specifications plug
i
n
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-07-10
Axel R
i
chard
[UI Tests]
Use RCPTT runner & ma
v
en plugins 2
.
0
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-07-10
Axe
l
Rich
a
rd
[
UI
T
ests] RC
P
TT - U
s
e Mars R
rel
e
ase in M
a
rs
profile
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-07-09
Axel Richard
[470398
]
Fix NPE in EMFCStruct
u
reM
e
rg
e
V
i
e
w
e
rC
o
n
t
e
ntProvider
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-07-07
Axel Richard
[470503] Some c
a
scading di
f
fs not mer
g
ed with
menu
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-07-07
Axel Richa
r
d
Update Mars
TPs with jd
t
.
annotation
plugin
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-22
Axel
Richard
[453408] Fi
x
S
WTException in EMFCSM
V
#inte
r
nalRedraw()
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-22
Axel Richard
[470396] Fix NPE in CompareToolBar
#
setEn
a
bled(boo
l
ean)
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-18
Axel Ric
h
ard
[RelEng]
Update
tycho f
r
om 0
.
21
to 0
.
23
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-18
Ax
e
l Rich
a
rd
[RelEng
]
Update jarsign
e
r version from 1
.
0
.
5 to 1
.
1
.
2
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-18
Axel
R
icha
r
d
Fix UML D
a
n
g
lingStereotypeApplication detec
t
ion
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-18
Axel Richard
[Te
s
ts] Add tests for ne
w
UML dangling S
t
e
r
eot
y
pe Appl
i
c
a
ti
o
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-18
Ax
e
l
Richar
d
A
d
d n
e
w U
M
L Dang
l
i
n
gS
t
e
reotypeAppl
i
cation
c
oncept
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-17
Axel
R
i
c
h
ard
[
46
9
355] Fix conflicts
label shows wrong number of
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-17
Axel Ri
c
hard
[UI
T
es
t
s] Update pom
.
xml (R
C
P
T
T migration)
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-17
Axe
l
Richard
[UI Test
s
] Update pom
.
xml
(RCPTT migration)
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-17
Axel Richard
[
U
I Tests] Mov
e
from Q
7
to
RCPT
T
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-15
Axel Richard
[45
8
961] Fix Coordina
t
es change co
n
tains diffs from
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-11
Axel Ri
c
hard
[
U
I
T
es
t
s] Update test
s
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-10
Axel Richard
[
U
I Tests] Upd
a
te
t
ests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-10
A
x
el
R
ichard
[469
2
3
7] Merge Refining diffs if all refined diffs
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-10
Axel Richard
[
459131] Fix R
e
-
connect changed resourc
e
s &
random
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-10
Axel Richard
B
u
mp featu
r
e ve
r
sio
n
s t
o
3
.
2
.
0 on master
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-10
Axel Richard
[UI Tests] Update Mars c
o
nfig
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-10
Axel Richa
r
d
[
U
I
] Update TP for
Mars
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-08
Axel Ri
c
hard
[Doc] Update user-gu
i
de
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-08
Axel
R
ichar
d
[Doc
]
U
pdate
g
ene
r
ated qualified ver
s
i
o
n f
o
r web
s
ite
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-05
A
x
el
R
i
c
hard
[UI
T
ests] Update Ma
r
s from RC2 to RC3 for Q7 t
e
s
ts
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-01
A
x
el R
i
chard
Update a
l
l TPs wi
t
h lat
e
st Orbit release
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-01
Axel Richard
[468740] Fix By Si
d
e Group Provider: Left Si
d
e Group
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-06-01
Axel Richard
[468913] Fix
N
P
E in PapyrusDi
a
gram3Way
D
iffHandle
r
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-29
Ax
e
l
Richard
Happy Checksty
l
e
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-28
Axel R
i
chard
A
d
d
s Q7 t
e
st for UML pro
f
i
l
es
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-28
Axel Rich
a
rd
Fix typos in c
o
re s
d
k & egit sdk feature
n
a
mes
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-27
Axel Richard
[467684]
F
ix
C
om
p
a
r
eToolba
r
is g
r
ayed ou
t
a
f
t
er sav
i
ng
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-27
Ax
e
l Rich
a
rd
[468267] Fix N
P
E
in
E
MFCompareDiffTreeRuler#f
i
ndF
i
rstAncesto
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-26
Axe
l
Ri
c
h
a
rd
[467668]
F
ix Accept/Reject All butt
o
ns b
e
h
a
viour wi
t
h
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-26
A
x
el
R
ichard
[UI Te
s
ts] Update shell script
t
o
use Eclips
e
Mars
.
.
.
commit
|
commitdiff
|
tree
2015-05-18
A
x
e
l Ri
c
hard
Fix Th
r
eadedModelResolve
r
i
n
it
i
alization on performances
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-18
Axel R
i
chard
[
D
o
c
] U
p
da
t
e user guide
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-13
A
x
el Richard
[4
5
8
9
71] Fix infini
t
e
l
o
o
p
in Graph
.
Br
e
a
d
thFirstIterator
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-11
Axe
l
Richard
[UI Tests] Add EM
C
o
m
pare EGit featu
r
e t
o
mars profi
l
e
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-11
Axel Ric
h
ard
[UI Te
s
ts] Use Mars M7 in AUT creatio
n
s
c
ript
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-11
Axel Richard
Update
m
ars-sdk target pl
a
tform for M
a
r
s
M7
commit
|
commitdiff
|
tree
2015-05-06
Axel Richard
[UI Tests] - Update Q
7
T
e
s
ts
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-06
Axel Richard
[UI Test
s
]
- Update Q7 Tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-05
Axel Richard
[4637
8
5] Res
o
u
rceLocationChange: UI changes
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-05
Axel Richard
[463785]
R
e
sou
r
ce
L
ocation
C
ha
n
g
e
:
cor
e
chan
g
es
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-27
Axel Ri
c
h
ard
[463785] Add
n
ew concept in EMF Compare:
ResourceLocationCh
a
nge
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-17
Axel Richar
d
Fix Unsup
p
ortedOperationException in ThreadedModelResolver
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-16
Axel R
i
c
h
ard
[4
6
461
3
] Check if
URIs exist in
the model dependenc
y
.
.
.
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-14
Axel
Richard
[
UI
T
e
sts] Update ui tests
Signed-off-by:
Axel Richard
<axel.richard@obeo.fr>
commit
|
commitdiff
|
tree
next