remote-hg: make sure fake bookmarks are updated
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
Apr 11, 2013 at 07:23 UTC
8120014e2ba0e65748c8a3c1642bed0891be851d
3 files changed
+9
contrib/remote-helpers/git-remote-hg
+7
@@ -709,9 +709,16 @@ def do_export(parser):
709
old = bmarks[bmark].hex()
710
else:
711
old = ''
712
+
713
+ if bmark == 'master' and 'master' not in parser.repo._bookmarks:
714
+ # fake bookmark
715
+ print "ok %s" % ref
716
+ continue
717
+
718
if not bookmarks.pushbookmark(parser.repo, bmark, old, node):
719
print "error %s" % ref
720
continue
721
+
722
elif ref.startswith('refs/tags/'):
723
tag = ref[len('refs/tags/'):]
724
parser.repo.tag([tag], node, None, True, None, {})
contrib/remote-helpers/test-hg-bidi.sh
+1
@@ -30,6 +30,7 @@ git_clone () {
30
hg_clone () {
31
(
32
hg init $2 &&
33
+ hg -R $2 bookmark -i master &&
34
cd $1 &&
35
git push -q "hg::$PWD/../$2" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*'
36
) &&
contrib/remote-helpers/test-hg-hg-git.sh
+1
@@ -35,6 +35,7 @@ git_clone_git () {
35
hg_clone_git () {
36
(
37
hg init $2 &&
38
+ hg -R $2 bookmark -i master &&
39
cd $1 &&
40
git push -q "hg::$PWD/../$2" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*'
41
) &&