Mercurial > hg
view tests/test-convert @ 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 | 0941ee76489e |
children | a7178eccf2dc |
line wrap: on
line source
#!/bin/sh cat >> $HGRCPATH <<EOF [extensions] convert= [convert] hg.saverev=False EOF hg help convert hg init a cd a echo a > a hg ci -d'0 0' -Ama hg cp a b hg ci -d'1 0' -mb hg rm a hg ci -d'2 0' -mc hg mv b a hg ci -d'3 0' -md echo a >> a hg ci -d'4 0' -me cd .. hg convert a 2>&1 | grep -v 'subversion python bindings could not be loaded' hg --cwd a-hg pull ../a touch bogusfile echo % should fail hg convert a bogusfile mkdir bogusdir chmod 000 bogusdir echo % should fail hg convert a bogusdir echo % should succeed chmod 700 bogusdir hg convert a bogusdir echo % test pre and post conversion actions echo 'include b' > filemap hg convert --debug --filemap filemap a partialb | \ grep 'run hg' echo % converting empty dir should fail "nicely" mkdir emptydir # override $PATH to ensure p4 not visible; use $PYTHON in case we're # running from a devel copy, not a temp installation PATH=$BINDIR $PYTHON $BINDIR/hg convert emptydir 2>&1 | sed 's,file://.*/emptydir,.../emptydir,g'