Mercurial > public > mercurial-scm > hg-stable
diff tests/test-push-warn @ 10771:01f097c4ae66 stable
push: fix bug in prepush logic and its tests
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Fri, 26 Mar 2010 17:02:36 +0100 |
parents | 844d83da2da9 |
children | a9702c47a19f |
line wrap: on
line diff
--- a/tests/test-push-warn Fri Mar 26 17:02:23 2010 +0100 +++ b/tests/test-push-warn Fri Mar 26 17:02:36 2010 +0100 @@ -166,4 +166,32 @@ hg -R k push -r a j echo +echo % prepush -r should not allow you to sneak in new heads +hg init l +cd l +echo a >> foo +hg -q add foo +hg -q branch a +hg -q ci -d '0 0' -ma +hg -q up null +echo a >> foo +hg -q add foo +hg -q branch b +hg -q ci -d '0 0' -mb +cd .. +hg -q clone l m -u a +cd m +hg -q merge b +hg -q ci -d '0 0' -mmb +hg -q up 0 +echo a >> foo +hg -q ci -ma2 +hg -q up 2 +echo a >> foo +hg -q branch -f b +hg -q ci -d '0 0' -mb2 +hg -q merge 3 +hg -q ci -d '0 0' -mma +hg push ../l -b b + exit 0