diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2013-05-24 21:29:52 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-05-28 08:02:05 -0700 |
| commit | d3c460b5b43ab67de894c9d3b6d6ce20f3f00070 (patch) | |
| tree | 61f5d6201d6971b912c57e6158c4f10d5b7dc48d /contrib/remote-helpers/test-hg.sh | |
| parent | remote-hg: pass around revision refs (diff) | |
| download | tgif-d3c460b5b43ab67de894c9d3b6d6ce20f3f00070.tar.xz | |
remote-hg: check diverged bookmarks
So that we can report a proper error.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/remote-helpers/test-hg.sh')
| -rwxr-xr-x | contrib/remote-helpers/test-hg.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index 608b1bbbfa..20f5b32123 100755 --- a/contrib/remote-helpers/test-hg.sh +++ b/contrib/remote-helpers/test-hg.sh @@ -380,7 +380,7 @@ test_expect_success 'remote update bookmark diverge' ' check_bookmark hgrepo diverge "bump bookmark" ' -test_expect_failure 'remote new bookmark multiple branch head' ' +test_expect_success 'remote new bookmark multiple branch head' ' test_when_finished "rm -rf gitrepo*" && ( |