Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-hgrc.out @ 5483:0c43f87baba3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 27 Oct 2007 16:27:55 +0400
parents 1e47f6fc0fdc
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1474
1e47f6fc0fdc Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 abort: Failed to parse .../t/.hg/hgrc
1e47f6fc0fdc Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
2 File contains no section headers.
1e47f6fc0fdc Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
3 file: .../t/.hg/hgrc, line: 1
1e47f6fc0fdc Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
4 'invalid\n'