Mercurial > hg

view tests/test-mq-qpush-fail.out @ 4682:dc5920ea12f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix small bug with a failed merge across a rename If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy f to fd, and util.set_exec wouldn't find the file.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 22 Jun 2007 20:44:40 -0300
parents 17f5d2069551
children c2a21fe60994
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