Mercurial > hg
view tests/test-convert-bzr-114 @ 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 | 13b36eb14324 |
children |
line wrap: on
line source
#!/bin/sh "$TESTDIR/hghave" bzr114 || exit 80 . "$TESTDIR/bzr-definitions" # The file/directory replacement can only be reproduced on # bzr >= 1.4. Merge it back in test-convert-bzr-directories once # this version becomes mainstream. echo % replace file with dir mkdir test-replace-file-with-dir cd test-replace-file-with-dir bzr init -q source cd source echo d > d bzr add -q d bzr commit -q -m 'add d file' rm d mkdir d bzr add -q d bzr commit -q -m 'replace with d dir' echo a > d/a bzr add -q d/a bzr commit -q -m 'add d/a' cd .. hg convert source source-hg manifest source-hg tip cd source-hg hg update cd ../..