Revert "remote-hg: update bookmarks when pulling"

This reverts commit 24317ef32ac3111ed00792f9b2921dc19dd28fe2.

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
parent 95d26d9be6
commit d98d5bff27

View File

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