Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-hgrc.out
author Giorgos Keramidas <keramida@ceid.upatras.gr>
Tue, 10 Oct 2006 21:03:24 +0300
changeset 3351 50a18815e3f0
parent 1474 1e47f6fc0fdc
permissions -rw-r--r--
Revert changeset c67920d78248. It breaks 'hg merge && hg up -c REV' when files exist only in one of the manifests, making hg throw a traceback like:
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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'
mercurial-crew-with-dirclash