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
[492341] Res Att Change correctly implies diffs
2016-04-27
Mathieu Cartaud
[
492
3
41
]
R
es Att Change co
r
r
ectly
i
mplies diffs
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-29
Mathieu
C
artaud
Fix
g
i
t
related tests
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-26
Mathieu Car
t
aud
[487561] F
i
x issue on resou
r
ce
attach
m
ent m
o
ve conflict
.
.
.
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-25
Mathie
u
Car
t
aud
Fi
x
e
r
ror
i
n Git tests setup
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-23
Mathieu Cartaud
[
487306] U
s
e only
rele
v
ant diagnostic to compute
traver
s
als
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-19
Mathieu
C
artau
d
[487561]
F
ix missing conflict on resourc
e
u
nc
o
nt
r
ol
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-19
M
ath
i
eu Ca
r
t
au
d
F
i
x error in t
h
e s
e
tup o
f
E
Git related tests
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-19
Mathieu Cartau
d
A
dd
G
oogle
G
SON in ta
r
g
e
t platfor
m
(required by JGit
)
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-09
Mathieu Cartau
d
Remove usel
e
ss method
i
n ResourceAttachmentCha
n
ge
C
onfli
c
tS
e
arch
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-09
M
a
thieu Cartaud
Reactivate org
.
eclip
s
e
.
emf
.
compare
.
tests test suite
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-03
M
a
thieu Cartau
d
[487011] F
i
x
w
rong con
f
lict
detection
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-01
Mathieu
Cartaud
I
mprov
e
progress monitor to
allow cancelling
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-01
Mathi
e
u Cartaud
S
calable co
n
flic
t
detector
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-27
M
a
thi
e
u
Carta
u
d
Add missi
n
g test suite for Ne
o
n build
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-26
M
a
thieu Ca
r
taud
[48
5
266] Fix merg
e
consequenc
e
s for
d
elete/mov
e
c
onfli
c
ts
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-22
Mat
h
ie
u
Cartaud
Use JGi
t
provided
p
rogr
e
ss monitor
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-20
Mathieu Cartaud
[48
6
093]
Don't
c
reate log file
i
f lo
g
s are
off
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-13
Math
i
eu Cartaud
[485538] Fix Class
C
astException
in
M
ergeResolutionMan
a
ger
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-08
M
athieu
C
a
r
t
aud
[484579] F
i
x merge
c
o
n
sequences al
g
orithm
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-08
M
a
t
hieu C
a
rtaud
Add d
e
bug logging for
m
erge action
s
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-06
Mathieu Cart
a
ud
Fix RCPT
T
b
ugs
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-11-04
Mathie
u
Cartaud
[475935] Fix potential
I
llegalStateException
in
Merge
V
iewerIte
m
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-27
M
a
thieu
Cartaud
[473190]
F
ix
N
PE in the CompareStructureMergeView
e
r
.
.
.
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-20
Mathieu Cartau
d
[UI tes
t
s] Fix
p
a
pyrus RCPTT tests
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-20
Mathieu Cartaud
[
U
I tests] Fix pa
p
yrus RC
P
TT tests
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-19
Math
i
eu Cartaud
[UI test
s
] Ad
d
te
s
ts involvin
g
Pap
y
rus & Egi
t
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-15
Mathieu Cartaud
Extract EMFCompareConfigu
r
ation from EMFCom
p
areRCPUIPlugin
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-13
Mathieu Cartaud
[47
7
76
9
] P
a
p
y
rus
linked Resource
A
tt
a
ch
m
entCh
a
nges
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-12
Mat
h
ieu Car
t
aud
Fix bugs cau
s
e
d by an EGit update
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-01
Mathieu C
a
rtaud
Implemen
t
a
tion of contextu
a
l tooltips
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-01
M
a
thieu Cartaud
[478032] Fix accept/re
j
ec
t
drop
d
own icon
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-09-30
Mathieu Cartaud
[464386] Add commit
s
hor
t
id to make labe
l
more dist
i
nguishi
.
.
.
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-09-23
Mathieu Ca
r
ta
u
d
Model M
e
rge
T
ool + cla
s
ses to do mo
d
e
l
merges with
.
.
.
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-09-15
M
a
thie
u
C
artaud
Fix label issues when u
s
ing the
M
er
g
eTool on me
r
ge
.
.
.
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-09-03
Mathieu Car
t
aud
I
m
plemen
t
atio
n
of contextual to
o
ltips
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-09-03
Mathieu Cartaud
[
473190
]
Fix NPE in the
C
ompa
r
e
StructureMerge
V
iew
e
r
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-09-02
Mathieu
Cartaud
Add a proposal for the
m
odificatio
n
of
Compare U
I
toolti
p
s
.
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-09-02
Mathieu Cartaud
[411485]
F
ix the CMV display for moves
b
eteen two conta
i
n
ers
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-09-02
Mathieu
Cart
a
ud
[464386] Add commit s
h
ort id t
o
make
la
b
el more distinguishi
b
le
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-08-31
Mathieu Cartaud
[4114
8
5
] Fix the CMV display fo
r
m
o
v
e
b
etween
two c
o
n
t
aine
r
s
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree