From: Felipe Contreras Date: Sat, 25 May 2013 02:29:43 +0000 (-0500) Subject: remote-hg: add test for new bookmark special X-Git-Tag: v1.8.4-rc0~191^2~21 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ad22b92a810bd793e4a357d0230beefb865e929e 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 Signed-off-by: Junio C Hamano --- 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