Mercurial > hg
view tests/test-merge10 @ 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 | 8766fee6f225 |
children |
line wrap: on
line source
#!/bin/sh # Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb # (merge correctly when all the files in a directory are moved # but then local changes are added in the same directory) hg init a cd a mkdir -p testdir echo a > testdir/a hg add testdir/a hg commit -d '1000000 0' -m a cd .. hg clone a b cd a echo alpha > testdir/a hg commit -d '1000000 0' -m remote-change cd .. cd b mkdir testdir/subdir hg mv testdir/a testdir/subdir/a hg commit -d '1000000 0' -m move mkdir newdir echo beta > newdir/beta hg add newdir/beta hg commit -d '1000000 0' -m local-addition hg pull ../a hg up -C 2 hg merge hg stat hg diff --nodates