Mercurial > hg
view tests/test-mq-missingfiles.out @ 6025:f2335246e5c7
filemerge: wrap quotes around tool path
author | Steve Borho <steve@borho.org> |
---|---|
date | Mon, 04 Feb 2008 19:38:34 -0600 |
parents | 3d1f9dcecdea |
children | 3fffba1c87d0 |
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 hunk 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