Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-mq-qpush-fail @ 5429:77cafe8f89e0
findcopies: fix rename bug
We've fiddled with this line several times, and an old bug has
reappeared from it. Let's take a peek at the history.
The original "or" (rev 3674, in 0.9.2 and 0.9.3):
http://www.selenic.com/hg/rev/9103dab96093
Then I changed it to an "and" to fix a bug (rev 4304):
http://www.selenic.com/hg/rev/4787e2b0dd03
Then for reasons now lost in the mists of time, I dropped half (rev 4399):
http://www.selenic.com/hg/rev/93652499bed3
Then we added back the "or" (rev 4416, in 0.9.4):
http://www.selenic.com/hg/rev/bb1800a7d7e1
So it seems it ought to be "and".
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 08 Oct 2007 18:47:22 -0500 |
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