Show More
@@ -160,6 +160,17 b' sed -e "s/\\(+++ [a-zA-Z0-9_/.-]*\\).*/\\1/' | |||||
160 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" ../.hg/patches/foo |
|
160 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" ../.hg/patches/foo | |
161 | hg status |
|
161 | hg status | |
162 |
|
162 | |||
|
163 | echo % qpush failure | |||
|
164 | cd .. | |||
|
165 | hg qrefresh | |||
|
166 | hg qnew -mbar bar | |||
|
167 | echo foo > foo | |||
|
168 | hg add foo | |||
|
169 | hg qrefresh | |||
|
170 | hg qpop -a | |||
|
171 | echo bar > foo | |||
|
172 | hg qpush -a | |||
|
173 | ||||
163 | cat >>$HGRCPATH <<EOF |
|
174 | cat >>$HGRCPATH <<EOF | |
164 | [diff] |
|
175 | [diff] | |
165 | git = True |
|
176 | git = True |
@@ -164,6 +164,14 b' diff -r cb9a9f314b8b b/f' | |||||
164 | @@ -0,0 +1,1 @@ |
|
164 | @@ -0,0 +1,1 @@ | |
165 | +f |
|
165 | +f | |
166 | M a |
|
166 | M a | |
|
167 | % qpush failure | |||
|
168 | Patch queue now empty | |||
|
169 | applying foo | |||
|
170 | applying bar | |||
|
171 | 1 out of 1 hunk ignored -- saving rejects to file foo.rej | |||
|
172 | patch failed, unable to continue (try -v) | |||
|
173 | patch failed, rejects left in working dir | |||
|
174 | Errors during apply, please fix and refresh bar | |||
167 | new file |
|
175 | new file | |
168 |
|
176 | |||
169 | diff --git a/new b/new |
|
177 | diff --git a/new b/new |
General Comments 0
You need to be logged in to leave comments.
Login now