Skip to content

Commit 629b60a

Browse files
felipecgitster
authored andcommitted
Revert "remote-hg: update bookmarks when pulling"
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3244eb9 commit 629b60a

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

contrib/remote-helpers/git-remote-hg

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -363,9 +363,6 @@ def get_repo(url, alias):
363363
die('Repository error')
364364
repo.pull(peer, heads=None, force=True)
365365

366-
rb = peer.listkeys('bookmarks')
367-
bookmarks.updatefromremote(myui, repo, rb, url)
368-
369366
return repo
370367

371368
def rev_to_mark(rev):

0 commit comments

Comments
 (0)