Show More
@@ -27,10 +27,10 b" def precheck(repo, revs, action='rewrite" | |||||
27 | hint = _("no changeset checked out") |
|
27 | hint = _("no changeset checked out") | |
28 | raise error.Abort(msg, hint=hint) |
|
28 | raise error.Abort(msg, hint=hint) | |
29 |
|
29 | |||
30 | publicrevs = repo.revs('%ld and public()', revs) |
|
|||
31 | if len(repo[None].parents()) > 1: |
|
30 | if len(repo[None].parents()) > 1: | |
32 | raise error.Abort(_("cannot %s while merging") % action) |
|
31 | raise error.Abort(_("cannot %s while merging") % action) | |
33 |
|
32 | |||
|
33 | publicrevs = repo.revs('%ld and public()', revs) | |||
34 | if publicrevs: |
|
34 | if publicrevs: | |
35 | msg = _("cannot %s public changesets") % (action) |
|
35 | msg = _("cannot %s public changesets") % (action) | |
36 | hint = _("see 'hg help phases' for details") |
|
36 | hint = _("see 'hg help phases' for details") |
General Comments 0
You need to be logged in to leave comments.
Login now