Skip to content
Snippets Groups Projects
Commit 9abdc0bd authored by Pulkit Goyal's avatar Pulkit Goyal
Browse files

mergestate: add comments about couple of record types and minor reorder

I am trying to divide the records into certain groups and then have dedicated
objects for them. Taking baby steps in that direction.

Differential Revision: https://phab.mercurial-scm.org/D8717
parent fcd0cff3
No related branches found
No related tags found
No related merge requests found
......@@ -41,7 +41,12 @@
# Merge state record types. See ``mergestate`` docs for more.
RECORD_LOCAL = b'L'
RECORD_OTHER = b'O'
# record extra information about files
RECORD_FILE_VALUES = b'f'
# record merge labels
RECORD_LABELS = b'l'
RECORD_MERGED = b'F'
RECORD_CHANGEDELETE_CONFLICT = b'C'
RECORD_MERGE_DRIVER_MERGE = b'D'
RECORD_PATH_CONFLICT = b'P'
......@@ -44,5 +49,6 @@
RECORD_MERGED = b'F'
RECORD_CHANGEDELETE_CONFLICT = b'C'
RECORD_MERGE_DRIVER_MERGE = b'D'
RECORD_PATH_CONFLICT = b'P'
RECORD_MERGE_DRIVER_STATE = b'm'
......@@ -48,6 +54,4 @@
RECORD_MERGE_DRIVER_STATE = b'm'
RECORD_FILE_VALUES = b'f'
RECORD_LABELS = b'l'
RECORD_OVERRIDE = b't'
RECORD_UNSUPPORTED_MANDATORY = b'X'
RECORD_UNSUPPORTED_ADVISORY = b'x'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment