Felipe Contreras <felipe.contreras@xxxxxxxxx> writes:
> 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@xxxxxxxxx>
> ---
>
> Intended for master (v1.8.3).
Hmm, is this the one we merged yesterday?
>
> contrib/remote-helpers/git-remote-hg | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
> index dc276af..beb864b 100755
> --- a/contrib/remote-helpers/git-remote-hg
> +++ b/contrib/remote-helpers/git-remote-hg
> @@ -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):
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html