Mercurial > hg-stable
view tests/test-mq-qpush-fail.out @ 6425:2d9328a2f81f
copies: skip directory rename checks when not merging
The directory rename checks are not meaningful unless we're moving or copying
files across a branch during a merge.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 29 Mar 2008 12:39:47 -0500 |
parents | 8a5d8fb59ed2 |
children | fb32ae9c76e7 |
line wrap: on
line source
adding foo Patch queue now empty applying patch1 applying patch2 applying bad-patch transaction abort! rollback completed cleaning up working directory...done abort: decoding near 'é': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! changeset: 0:bbd179dfa0a7 tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: add foo % bar should be gone; other unknown/ignored files should still be around ? untracked-file I .hgignore C foo