summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Felipe Contreras <felipe.contreras@gmail.com>2013-05-24 21:29:43 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-05-28 08:01:49 -0700
commitad22b92a810bd793e4a357d0230beefb865e929e (patch)
tree6531485267d86fd06b8058c1543d840251062b16
parentremote-hg: add test for bookmark diverge (diff)
downloadtgif-ad22b92a810bd793e4a357d0230beefb865e929e.tar.xz
remote-hg: add test for new bookmark special
From the point of view of Mercurial, this creates a new branch head, and requires a forced push. Ideally, however, we would want it to work just like in git; new branches can be pushed without problems. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xcontrib/remote-helpers/test-hg.sh15
1 files changed, 15 insertions, 0 deletions
diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh
index 5b54e4b5c8..7a6e5dab51 100755
--- a/contrib/remote-helpers/test-hg.sh
+++ b/contrib/remote-helpers/test-hg.sh
@@ -370,4 +370,19 @@ test_expect_failure 'remote update bookmark diverge' '
check_bookmark hgrepo diverge "bump bookmark"
'
+test_expect_failure 'remote new bookmark multiple branch head' '
+ test_when_finished "rm -rf gitrepo*" &&
+
+ (
+ git clone "hg::hgrepo" gitrepo &&
+ cd gitrepo &&
+ git checkout --quiet -b feature-c HEAD^ &&
+ echo feature-c > content &&
+ git commit -a -m feature-c &&
+ git push --quiet origin feature-c
+ ) &&
+
+ check_bookmark hgrepo feature-c feature-c
+'
+
test_done