comparison mercurial/cmdutil.py @ 40666:69268a13ffa5

branch: allow changing branch of merge commits with --rev

Tests show that changing branch of merge commits works fine with evolution and
without, so let's allow it. Other safeguards should prevent users from shooting
themselves in the foot.

40665:fb379b78b93e

        if len(roots) > 1:
            raise error.Abort(_("cannot change branch of non-linear revisions"))
        rewriteutil.precheck(repo, revs, 'change branch of')

        root = repo[roots.first()]
        if not root.p1().branch() == label and label in repo.branchmap():
            raise error.Abort(_("a branch of the same name already exists"))

        if repo.revs('merge() and %ld', revs):
            raise error.Abort(_("cannot change branch of a merge commit"))
        if repo.revs('obsolete() and %ld', revs):
            raise error.Abort(_("cannot change branch of a obsolete changeset"))

        # make sure only topological heads
        if repo.revs('heads(%ld) - head()', revs):

40666:69268a13ffa5

        if len(roots) > 1:
            raise error.Abort(_("cannot change branch of non-linear revisions"))
        rewriteutil.precheck(repo, revs, 'change branch of')

        root = repo[roots.first()]
        rpb = {parent.branch() for parent in root.parents()}
        if label not in rpb and label in repo.branchmap():
            raise error.Abort(_("a branch of the same name already exists"))

        if repo.revs('obsolete() and %ld', revs):
            raise error.Abort(_("cannot change branch of a obsolete changeset"))

        # make sure only topological heads
        if repo.revs('heads(%ld) - head()', revs):