annotate tests/bundles/renames.hg @ 26976:c48fee950ce4

debugmergestate: print out record type for files We're going to add a separate record type for change/delete conflicts soon. We need to make sure they get stored with the correct record type so that older versions of Mercurial correctly abort when they see change/delete records.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 13 Nov 2015 23:01:36 -0800
parents ebf6d38c9063
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
16551
ebf6d38c9063 localrepo: add setparents() to adjust dirstate copies (issue3407)
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
1 (binary:application/octet-stream)