equal
deleted
inserted
replaced
32 action is used to control the error message. |
32 action is used to control the error message. |
33 |
33 |
34 Make sure this function is called after taking the lock. |
34 Make sure this function is called after taking the lock. |
35 """ |
35 """ |
36 if nullrev in revs: |
36 if nullrev in revs: |
37 msg = _(b"cannot %s null changeset") % action |
37 msg = _(b"cannot %s the null revision") % action |
38 hint = _(b"no changeset checked out") |
38 hint = _(b"no changeset checked out") |
39 raise error.InputError(msg, hint=hint) |
39 raise error.InputError(msg, hint=hint) |
40 |
40 |
41 if len(repo[None].parents()) > 1: |
41 if len(repo[None].parents()) > 1: |
42 raise error.StateError(_(b"cannot %s while merging") % action) |
42 raise error.StateError(_(b"cannot %s while merging") % action) |