From 4d1d1a83254aa9c4fc226f90edc1189b15abc548 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Fri, 24 May 2013 21:29:47 -0500 Subject: [PATCH] remote-hg: force remote bookmark push selectively If we update the 'old' node, we might be updating the remote bookmark even when our 'new' node is not related at all to what the remote has, effectively forcing an update. Let's do that only when forced push is configured. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- git-remote-hg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-remote-hg b/git-remote-hg index 99de7c2..4d650b5 100755 --- a/git-remote-hg +++ b/git-remote-hg @@ -919,7 +919,8 @@ def do_export(parser): # update remote bookmarks remote_bmarks = peer.listkeys('bookmarks') for ref, bmark, old, new in p_bmarks: - old = remote_bmarks.get(bmark, '') + if force_push: + old = remote_bmarks.get(bmark, '') if not peer.pushkey('bookmarks', bmark, old, new): print "error %s" % ref else: