On Thu, May 16, 2013 at 1:16 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Junio C Hamano <gitster@xxxxxxxxx> writes: > >> 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? > > Just double-checking. Yes. -- Felipe Contreras -- 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