Show More
@@ -858,7 +858,7 b' class queue(object):' | |||||
858 | strip(self.ui, repo, [n], update=False, backup=False) |
|
858 | strip(self.ui, repo, [n], update=False, backup=False) | |
859 |
|
859 | |||
860 | ctx = repo[rev] |
|
860 | ctx = repo[rev] | |
861 | ret = hg.merge(ctx) |
|
861 | ret = hg.merge(ctx, remind=False) | |
862 | if ret: |
|
862 | if ret: | |
863 | raise error.Abort(_(b"update returned %d") % ret) |
|
863 | raise error.Abort(_(b"update returned %d") % ret) | |
864 | n = newcommit(repo, None, ctx.description(), ctx.user(), force=True) |
|
864 | n = newcommit(repo, None, ctx.description(), ctx.user(), force=True) |
@@ -132,7 +132,6 b' Merge:' | |||||
132 | patch didn't work out, merging patcha |
|
132 | patch didn't work out, merging patcha | |
133 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
133 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
134 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
134 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
135 | (branch merge, don't forget to commit) |
|
|||
136 | applying patcha2 |
|
135 | applying patcha2 | |
137 | now at: patcha2 |
|
136 | now at: patcha2 | |
138 |
|
137 |
General Comments 0
You need to be logged in to leave comments.
Login now