Skip to content

Commit

Permalink
Revert "remote-hg: update bookmarks when pulling"
Browse files Browse the repository at this point in the history
This reverts commit 24317ef.

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>
  • Loading branch information
Felipe Contreras authored and Junio C Hamano committed May 16, 2013
1 parent 3244eb9 commit 629b60a
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions contrib/remote-helpers/git-remote-hg
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down

0 comments on commit 629b60a

Please sign in to comment.