Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
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.
authorBrendan Cully <brendan@kublai.com>
Sun, 13 May 2007 19:15:54 -0700
changeset 4437 a210b40d0860
parent 4436 a764edb6fc95
child 4438 3900f684a150
Make mergepatch save queue now that qpush isn't.
hgext/mq.py file | annotate | diff | comparison | revisions
tests/test-mq-merge file | annotate | diff | comparison | revisions
tests/test-mq-merge.out file | annotate | diff | comparison | revisions 
--- a/hgext/mq.py	Thu May 10 13:42:36 2007 -0700
+++ b/hgext/mq.py	Sun May 13 19:15:54 2007 -0700
@@ -417,6 +417,7 @@
                 self.applied_dirty = 1
             if err:
                 return (err, head)
+        self.save_dirty()
         return (0, head)
 
     def patch(self, repo, patchfile):
--- a/tests/test-mq-merge	Thu May 10 13:42:36 2007 -0700
+++ b/tests/test-mq-merge	Sun May 13 19:15:54 2007 -0700
@@ -37,3 +37,6 @@
 hg manifest
 hg qpush -a -m 2>&1 | rewrite_path
 hg manifest
+
+# ensure status is correct after merge
+hg qpop -a
--- a/tests/test-mq-merge.out	Thu May 10 13:42:36 2007 -0700
+++ b/tests/test-mq-merge.out	Sun May 13 19:15:54 2007 -0700
@@ -9,3 +9,4 @@
 applying rm_a
 Now at: rm_a
 b
+Patch queue now empty
Mercurial