view tests/test-mq-missingfiles.out @ 7541:11660d2918af

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 20 Dec 2008 16:27:51 -0600
parents abd2bc899d86
children fb32ae9c76e7
line wrap: on
line source

adding b
Patch queue now empty
% push patch with missing target
applying changeb
unable to find 'b' for patching
2 out of 2 hunks FAILED -- saving rejects to file b.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
Errors during apply, please fix and refresh changeb
% display added files
a
c
% display rejections
--- b
+++ b
@@ -1,3 +1,5 @@
+b
+b
 a
 a
 a
@@ -8,3 +10,5 @@
 a
 a
 a
+c
+c
adding b
Patch queue now empty
% push git patch with missing target
applying changeb
unable to find 'b' for patching
1 out of 1 hunks FAILED -- saving rejects to file b.rej
patch failed, unable to continue (try -v)
b: No such file or directory
b not tracked!
patch failed, rejects left in working dir
Errors during apply, please fix and refresh changeb
? b.rej
% display added files
a
c
% display rejections
--- b
+++ b
GIT binary patch
literal 2
Jc${No0000400IC2

% test push creating directory during git copy or rename
adding a
Patch queue now empty
applying patch
Now at: patch