Mercurial > hg > mercurial-crew-with-dirclash

changeset 3459:ba3a96750de0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: test case for issue399
author Brendan Cully <brendan@kublai.com>
date Wed, 18 Oct 2006 10:37:34 -0700
parents 031aac7ec584
children 2d35a8d2b32d
files tests/test-mq tests/test-mq.out
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-mq
+++ b/tests/test-mq
@@ -165,11 +165,13 @@ cd ..
 hg qrefresh
 hg qnew -mbar bar
 echo foo > foo
-hg add foo
+echo bar > bar
+hg add foo bar
 hg qrefresh
 hg qpop -a
 echo bar > foo
 hg qpush -a
+hg st
 
 cat >>$HGRCPATH <<EOF
 [diff]
--- a/tests/test-mq.out
+++ b/tests/test-mq.out
@@ -172,6 +172,8 @@ 1 out of 1 hunk ignored -- saving reject
 patch failed, unable to continue (try -v)
 patch failed, rejects left in working dir
 Errors during apply, please fix and refresh bar
+? foo
+? foo.rej
 new file
 
 diff --git a/new b/new