Mercurial Mercurial > hg-stable / 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-manifest.hg
author Martin Geisler <mg@lazybytes.net>
Sun, 27 Jun 2010 23:12:05 +0200
branchstable
changeset 11451 51021f4c80b5
parent 5406 f11554a097c8
permissions -rw-r--r--
resolve: do not crash on empty mergestate I managed to get an empty .hg/merge/state file by interrupting a merge by pressing Control-C. This lead to this error: TypeError: a2b_hex() argument 1 must be string or read-only buffer, not None since localnode is assigned None before the iteration over lines in the mergestate begins.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5406
f11554a097c8 test-manifest: test symlink and exec bit display
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     1
 
(binary:application/octet-stream)
hg-stable