Show More
@@ -44,7 +44,7 b" def precheck(repo, revs, action=b'rewrit" | |||
|
44 | 44 | revs = (r.rev() for r in revs) |
|
45 | 45 | |
|
46 | 46 | if len(repo[None].parents()) > 1: |
|
47 | raise error.StateError(_(b"cannot %s while merging") % action) | |
|
47 | raise error.StateError(_(b"cannot %s changesets while merging") % action) | |
|
48 | 48 | |
|
49 | 49 | publicrevs = repo.revs(b'%ld and public()', revs) |
|
50 | 50 | if publicrevs: |
@@ -406,7 +406,7 b' Refuse to amend during a merge:' | |||
|
406 | 406 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
407 | 407 | (branch merge, don't forget to commit) |
|
408 | 408 | $ hg ci --amend |
|
409 | abort: cannot amend while merging | |
|
409 | abort: cannot amend changesets while merging | |
|
410 | 410 | [20] |
|
411 | 411 | $ hg ci -m 'merge' |
|
412 | 412 |
General Comments 0
You need to be logged in to leave comments.
Login now