##// END OF EJS Templates
Make mergepatch save queue now that qpush isn't.
Brendan Cully -
r4437:a210b40d default
parent child Browse files
Show More
@@ -417,6 +417,7 b' class queue:'
417 self.applied_dirty = 1
417 self.applied_dirty = 1
418 if err:
418 if err:
419 return (err, head)
419 return (err, head)
420 self.save_dirty()
420 return (0, head)
421 return (0, head)
421
422
422 def patch(self, repo, patchfile):
423 def patch(self, repo, patchfile):
@@ -37,3 +37,6 b' hg ci -m update'
37 hg manifest
37 hg manifest
38 hg qpush -a -m 2>&1 | rewrite_path
38 hg qpush -a -m 2>&1 | rewrite_path
39 hg manifest
39 hg manifest
40
41 # ensure status is correct after merge
42 hg qpop -a
@@ -9,3 +9,4 b' merging with queue at: .hg/patches.1'
9 applying rm_a
9 applying rm_a
10 Now at: rm_a
10 Now at: rm_a
11 b
11 b
12 Patch queue now empty
General Comments 0
You need to be logged in to leave comments. Login now