##// END OF EJS Templates
mq: test case for issue399
Brendan Cully -
r3464:ba3a9675 default
parent child Browse files
Show More
@@ -165,11 +165,13 b' cd ..'
165 hg qrefresh
165 hg qrefresh
166 hg qnew -mbar bar
166 hg qnew -mbar bar
167 echo foo > foo
167 echo foo > foo
168 hg add foo
168 echo bar > bar
169 hg add foo bar
169 hg qrefresh
170 hg qrefresh
170 hg qpop -a
171 hg qpop -a
171 echo bar > foo
172 echo bar > foo
172 hg qpush -a
173 hg qpush -a
174 hg st
173
175
174 cat >>$HGRCPATH <<EOF
176 cat >>$HGRCPATH <<EOF
175 [diff]
177 [diff]
@@ -172,6 +172,8 b' 1 out of 1 hunk ignored -- saving reject'
172 patch failed, unable to continue (try -v)
172 patch failed, unable to continue (try -v)
173 patch failed, rejects left in working dir
173 patch failed, rejects left in working dir
174 Errors during apply, please fix and refresh bar
174 Errors during apply, please fix and refresh bar
175 ? foo
176 ? foo.rej
175 new file
177 new file
176
178
177 diff --git a/new b/new
179 diff --git a/new b/new
General Comments 0
You need to be logged in to leave comments. Login now