mercurial/commands.py

32450:548478efc46c

                               "(use -f to force)") % mark)
        if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
            and not force):
            raise error.Abort(
                _("a bookmark cannot have the name of an existing branch"))

    if delete and rename:
        raise error.Abort(_("--delete and --rename are incompatible"))
    if delete and rev:
        raise error.Abort(_("--rev is incompatible with --delete"))

32451:bce5ebe72859

                               "(use -f to force)") % mark)
        if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
            and not force):
            raise error.Abort(
                _("a bookmark cannot have the name of an existing branch"))
        if len(mark) > 3 and mark in repo and not force:
            repo.ui.warn(
                _("bookmark %s matches a changeset hash\n"
                  "(did you leave a -r out of an 'hg bookmark' command?)\n") %
                mark)

    if delete and rename:
        raise error.Abort(_("--delete and --rename are incompatible"))
    if delete and rev:
        raise error.Abort(_("--rev is incompatible with --delete"))