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
[
4
9234
1
] Res Att
C
h
ange c
o
rre
c
tly implies dif
f
s
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-02-29
M
athieu Cartaud
F
i
x git related test
s
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-02-25
Mathieu
C
arta
u
d
Fix error in Git tests s
e
tu
p
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-02-23
Mathieu Cartaud
[48730
6
]
U
se
only
r
el
e
vant diag
n
ostic to com
p
ute traversals
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-02-19
Math
i
eu Carta
u
d
[4875
6
1] Fix missing conflict on resource uncon
t
rol
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-02-19
Mathi
e
u Car
t
aud
Fix error in the setu
p
o
f E
G
it rela
t
ed tests
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-02-19
Mathi
e
u
Cart
a
ud
Add Googl
e
GSON in target
p
latform (required by JGit)
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-02-09
Mathieu Cartaud
Remove usel
e
ss
m
e
t
h
o
d
in
R
esou
r
ceAttachmen
t
Chang
e
Confl
i
ctSearch
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-02-09
Mat
h
ieu Cart
a
ud
Re
a
ctiv
a
te org
.
ecli
p
s
e
.
emf
.
compare
.
tes
t
s test suite
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-02-03
Ma
t
hieu Cartaud
[487011
]
Fix wrong conflict detection
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-02-01
Mat
h
ieu
Ca
r
t
a
ud
Sc
a
lab
l
e
con
f
li
c
t detect
o
r
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-01-27
Mathieu
Cartaud
Add missing test
suite
f
o
r Neon build
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-01-26
M
athieu Carta
u
d
[485266]
F
ix merge conseq
u
enc
e
s
for delete/
m
ove
co
n
flict
s
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-01-22
Mathieu Car
t
aud
U
s
e JGit provided progre
s
s monitor
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-01-20
Mathieu Cartaud
[486093] Don't
c
r
eate log file if log
s
are off
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-01-13
Mathieu Cart
a
u
d
[48553
8
]
F
ix ClassCastExcepti
o
n in
M
erge
R
esolu
t
ionManager
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-01-08
Math
i
eu Car
t
aud
[4
8
4579] Fix merge co
n
sequence
s
al
g
orith
m
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-01-08
Mathieu Cartaud
Add debug log
g
ing f
o
r
me
r
ge actions
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-01-06
M
a
t
h
i
e
u Ca
r
t
a
ud
Fix
RCPTT bugs
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-11-04
Mat
h
i
eu Cartau
d
[
475935] F
i
x potenti
a
l Illega
l
StateExcept
i
on in MergeViewe
r
Item
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-20
Mathieu Cartaud
[UI
tests]
F
ix
p
apyrus RCPTT tests
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-20
Math
i
eu Cartaud
[UI tests]
Fix papyrus RCPTT t
e
sts
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-19
Mathi
e
u
Cartaud
[UI tests]
A
d
d tests
involving
P
apyrus & Egit
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-15
M
a
th
i
eu Cartaud
Extract EMFC
o
m
p
a
reConfi
g
uration from
EMFC
o
mpareRCPUIPlug
i
n
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-13
Mathi
e
u
Cartaud
[477769
]
Papyrus linke
d
Resour
c
eAttac
h
mentCh
a
nge
s
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-12
Ma
t
hieu Cartaud
Fix bugs caused by an EGi
t
u
pdate
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-15
Mathieu Cartaud
Fix labe
l
issues when using the MergeT
o
ol
on
merge
.
.
.
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-02
Mathieu Cartaud
[464386] A
d
d comm
i
t short
id to make labe
l
more distingui
s
hible
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-08-31
Mathieu Cart
a
ud
[411485]
F
ix the
CMV di
s
pla
y
f
or
m
ove bet
w
een two containers
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree