test-mq-missingfiles.out
54 lines
| 1009 B
| text/plain
|
TextLexer
/ tests / test-mq-missingfiles.out
Patrick Mezard
|
r5581 | adding b | ||
Martin Geisler
|
r7627 | patch queue now empty | ||
Patrick Mezard
|
r5581 | % push patch with missing target | ||
applying changeb | ||||
Patrick Mezard
|
r5652 | unable to find 'b' for patching | ||
2 out of 2 hunks FAILED -- saving rejects to file b.rej | ||||
Patrick Mezard
|
r5581 | patch failed, unable to continue (try -v) | ||
patch failed, rejects left in working dir | ||||
Martin Geisler
|
r7627 | errors during apply, please fix and refresh changeb | ||
Patrick Mezard
|
r5581 | % display added files | ||
a | ||||
c | ||||
Patrick Mezard
|
r5652 | % display rejections | ||
--- b | ||||
+++ b | ||||
Matt Mackall
|
r5863 | @@ -1,3 +1,5 @@ | ||
Patrick Mezard
|
r5652 | +b | ||
+b | ||||
a | ||||
a | ||||
a | ||||
Matt Mackall
|
r5863 | @@ -8,3 +10,5 @@ | ||
Patrick Mezard
|
r5652 | a | ||
a | ||||
a | ||||
+c | ||||
+c | ||||
Patrick Mezard
|
r5581 | adding b | ||
Martin Geisler
|
r7627 | patch queue now empty | ||
Patrick Mezard
|
r5581 | % push git patch with missing target | ||
applying changeb | ||||
Patrick Mezard
|
r5652 | unable to find 'b' for patching | ||
Martin Geisler
|
r6952 | 1 out of 1 hunks FAILED -- saving rejects to file b.rej | ||
Patrick Mezard
|
r5581 | patch failed, unable to continue (try -v) | ||
b: No such file or directory | ||||
b not tracked! | ||||
patch failed, rejects left in working dir | ||||
Martin Geisler
|
r7627 | errors during apply, please fix and refresh changeb | ||
Patrick Mezard
|
r5652 | ? b.rej | ||
Patrick Mezard
|
r5581 | % display added files | ||
a | ||||
c | ||||
Patrick Mezard
|
r5652 | % display rejections | ||
--- b | ||||
+++ b | ||||
GIT binary patch | ||||
literal 2 | ||||
Jc${No0000400IC2 | ||||
Patrick Mezard
|
r7506 | % test push creating directory during git copy or rename | ||
adding a | ||||
Martin Geisler
|
r7627 | patch queue now empty | ||
Patrick Mezard
|
r7506 | applying patch | ||
Martin Geisler
|
r7627 | now at: patch | ||