undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote-hg: add test for bookmark diverge

Browse Source 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras 2013-05-24 21:29:42 -05:00 committed by Junio C Hamano
parent 1a810864e8
commit 747b61c6a6
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
contrib/remote-helpers/test-hg.sh
View File

@ -341,4 +341,33 @@ test_expect_failure 'remote push diverged' '
check_branch hgrepo default bump check_branch hgrepo default bump
' '
test_expect_failure 'remote update bookmark diverge' '
test_when_finished "rm -rf gitrepo*" &&
(
cd hgrepo &&
hg checkout tip^ &&
hg bookmark diverge
) &&
git clone "hg::hgrepo" gitrepo &&
(
cd hgrepo &&
echo "bump bookmark" > content &&
hg commit -m "bump bookmark"
) &&
(
cd gitrepo &&
git checkout --quiet diverge &&
echo diverge > content &&
git commit -a -m diverge &&
test_expect_code 1 git push 2> error &&
grep "^ ! \[rejected\] *diverge -> diverge (non-fast-forward)$" error
) &&
check_bookmark hgrepo diverge "bump bookmark"
'
test_done test_done