summaryrefslogtreecommitdiff
path: root/contrib/remote-helpers/git-remote-hg
diff options
context:
space:
mode:
authorLibravatar Felipe Contreras <felipe.contreras@gmail.com>2013-05-24 21:29:31 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-05-28 07:59:30 -0700
commit9529cce86e508d1910395d7493b7b8706ea7cd37 (patch)
tree7db2274d027af25be771f98115c713903ea94ce9 /contrib/remote-helpers/git-remote-hg
parentremote-hg: upgrade version 1 marks (diff)
downloadtgif-9529cce86e508d1910395d7493b7b8706ea7cd37.tar.xz
remote-hg: ensure remote rebasing works
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/remote-helpers/git-remote-hg')
-rwxr-xr-xcontrib/remote-helpers/git-remote-hg1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index 2e4f7ca425..e0e68eff2c 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -621,6 +621,7 @@ def do_import(parser):
if os.path.exists(path):
print "feature import-marks=%s" % path
print "feature export-marks=%s" % path
+ print "feature force"
sys.stdout.flush()
tmp = encoding.encoding