Mercurial > hg
view tests/test-586 @ 8564:6b9ec23b09fc
named branches: improve pre-push logic (issue736)
Each named branch is considered separately, and the push is allowed if
no new branch heads are created for any named branch to be pushed.
Due to some tests's use of --debug, their output will change after this
addition. This has been fixed as well.
Co-contributor: Henrik Stuart <henrik.stuart@edlund.dk>
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Sat, 23 May 2009 17:04:31 +0200 |
parents | f1af59451c0c |
children |
line wrap: on
line source
#!/bin/sh # a test for issue586 hg init a cd a echo a > a hg ci -Ama hg init ../b cd ../b echo b > b hg ci -Amb hg pull -f ../a hg merge hg rm -f a hg ci -Amc hg st -A cd .. # a test for issue 1433, related to issue586 echo % create test repos hg init repoa touch repoa/a hg -R repoa ci -Am adda hg init repob touch repob/b hg -R repob ci -Am addb hg init repoc cd repoc hg pull ../repoa hg update mkdir tst hg mv * tst hg ci -m "import a in tst" hg pull -f ../repob echo % merge both repos hg merge mkdir src echo % move b content hg mv b src hg ci -m "import b in src" hg manifest