diff --git a/remotenames.py b/remotenames.py index a4f31988c3..d7af85e3e9 100644 --- a/remotenames.py +++ b/remotenames.py @@ -218,6 +218,8 @@ def expushdiscoverybookmarks(pushop): raise util.Abort('remote bookmark revision is not in local repo; ' 'will not push without --force. ' 'Do you need to pull and rebase?') + if repo[old] == repo[rev]: + raise util.Abort('remote bookmark already points at rev') if not repo[old].descendant(repo[rev]): raise util.Abort('pushed rev is not a descendant of remote ' 'bookmark, will not push without --force')