Revert "remote-hg: update bookmarks when pulling"

This reverts commit 24317ef32a.

Different versions of Mercurial have different arguments for
bookmarks.updatefromremote(), while it should be possible to call the
right function with the right arguments depending on the version, it's
safer to restore the old behavior for now.

Reported by Rodney Lorrimar.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras 2013-05-16 07:43:15 -05:00 committed by Junio C Hamano
parent 3244eb9b5a
commit 629b60a77d

View File

@ -363,9 +363,6 @@ def get_repo(url, alias):
die('Repository error')
repo.pull(peer, heads=None, force=True)
rb = peer.listkeys('bookmarks')
bookmarks.updatefromremote(myui, repo, rb, url)
return repo
def rev_to_mark(rev):