Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-mq-qpush-fail @ 5390:36c46e20976a
merge: provide *_ISLINK environment vars to merge helper
Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 03 Oct 2007 23:09:36 +0200 |
parents | 17f5d2069551 |
children |
line wrap: on
line source
#!/bin/sh # Test that qpush cleans things up if it doesn't complete echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH hg init repo cd repo echo foo > foo hg ci -Am 'add foo' -d '0 0' touch untracked-file echo 'syntax: glob' > .hgignore echo '.hgignore' >> .hgignore hg qinit hg qnew patch1 echo >> foo hg qrefresh -m 'patch 1' hg qnew patch2 echo bar > bar hg add bar hg qrefresh -m 'patch 2' hg qnew bad-patch echo >> foo hg qrefresh hg qpop -a python -c 'print "\xe9"' > message cat .hg/patches/bad-patch >> message mv message .hg/patches/bad-patch hg qpush -a && echo 'qpush succeded?!' hg parents echo '% bar should be gone; other unknown/ignored files should still be around' hg status -A