Mercurial > hg
view tests/test-convert-bzr-114 @ 9954:d6a307719ccb stable
fix bug in prepush logic involving merge changesets
When creating new branches and merging them into existing ones, you would
sometimes be able to push some changesets (the existing branches) without using
--force, even when that creates a new head on the remote.
A test which triggers the error has been added.
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Mon, 30 Nov 2009 14:58:52 +0100 |
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 ../..