Mercurial > hg

view tests/test-mq-qpush-fail.out @ 6521:a3668330f14a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test that internal merge tools are used when set for a merge-pattern in hgrc It is possible to specify that one of the internal merge tools (internal:fail, internal:local or internal:other) should be used for performing merges on files matching a given pattern. This test makes sure that such a setting actually works.
author Dov Feldstern <dfeldstern@fastimap.com>
date Fri, 04 Apr 2008 02:20:58 +0300
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