Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-mq-merge @ 4437:a210b40d0860

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make mergepatch save queue now that qpush isn't.
author Brendan Cully <brendan@kublai.com>
date Sun, 13 May 2007 19:15:54 -0700
parents 4f721e96f1de
children
line wrap: on
line diff
--- a/tests/test-mq-merge
+++ b/tests/test-mq-merge
@@ -37,3 +37,6 @@ hg ci -m update
 hg manifest
 hg qpush -a -m 2>&1 | rewrite_path
 hg manifest
+
+# ensure status is correct after merge
+hg qpop -a