Show More
@@ -39,25 +39,40 b' def _filectxorabsent(hexnode, ctx, f):' | |||
|
39 | 39 | |
|
40 | 40 | |
|
41 | 41 | # Merge state record types. See ``mergestate`` docs for more. |
|
42 | ||
|
43 | #### | |
|
44 | # merge records which records metadata about a current merge | |
|
45 | # exists only once in a mergestate | |
|
46 | ##### | |
|
42 | 47 | RECORD_LOCAL = b'L' |
|
43 | 48 | RECORD_OTHER = b'O' |
|
44 | # record extra information about files | |
|
45 | RECORD_FILE_VALUES = b'f' | |
|
46 | 49 | # record merge labels |
|
47 | 50 | RECORD_LABELS = b'l' |
|
51 | # store info about merge driver used and it's state | |
|
52 | RECORD_MERGE_DRIVER_STATE = b'm' | |
|
48 | 53 | |
|
54 | ##### | |
|
55 | # record extra information about files, with one entry containing info about one | |
|
56 | # file. Hence, multiple of them can exists | |
|
57 | ##### | |
|
58 | RECORD_FILE_VALUES = b'f' | |
|
59 | ||
|
60 | ##### | |
|
61 | # merge records which represents state of individual merges of files/folders | |
|
62 | # These are top level records for each entry containing merge related info. | |
|
63 | # Each record of these has info about one file. Hence multiple of them can | |
|
64 | # exists | |
|
65 | ##### | |
|
49 | 66 | RECORD_MERGED = b'F' |
|
50 | 67 | RECORD_CHANGEDELETE_CONFLICT = b'C' |
|
51 | 68 | RECORD_MERGE_DRIVER_MERGE = b'D' |
|
69 | # the path was dir on one side of merge and file on another | |
|
52 | 70 | RECORD_PATH_CONFLICT = b'P' |
|
53 | 71 | |
|
54 | RECORD_MERGE_DRIVER_STATE = b'm' | |
|
55 | RECORD_OVERRIDE = b't' | |
|
56 | ||
|
57 | MERGE_DRIVER_STATE_UNMARKED = b'u' | |
|
58 | MERGE_DRIVER_STATE_MARKED = b'm' | |
|
59 | MERGE_DRIVER_STATE_SUCCESS = b's' | |
|
60 | ||
|
72 | ##### | |
|
73 | # possible state which a merge entry can have. These are stored inside top-level | |
|
74 | # merge records mentioned just above. | |
|
75 | ##### | |
|
61 | 76 | MERGE_RECORD_UNRESOLVED = b'u' |
|
62 | 77 | MERGE_RECORD_RESOLVED = b'r' |
|
63 | 78 | MERGE_RECORD_UNRESOLVED_PATH = b'pu' |
@@ -67,6 +82,21 b" MERGE_RECORD_DRIVER_RESOLVED = b'd'" | |||
|
67 | 82 | # of other version. This info is used on commit. |
|
68 | 83 | MERGE_RECORD_MERGED_OTHER = b'o' |
|
69 | 84 | |
|
85 | ##### | |
|
86 | # top level record which stores other unknown records. Multiple of these can | |
|
87 | # exists | |
|
88 | ##### | |
|
89 | RECORD_OVERRIDE = b't' | |
|
90 | ||
|
91 | ##### | |
|
92 | # possible states which a merge driver can have. These are stored inside a | |
|
93 | # RECORD_MERGE_DRIVER_STATE entry | |
|
94 | ##### | |
|
95 | MERGE_DRIVER_STATE_UNMARKED = b'u' | |
|
96 | MERGE_DRIVER_STATE_MARKED = b'm' | |
|
97 | MERGE_DRIVER_STATE_SUCCESS = b's' | |
|
98 | ||
|
99 | ||
|
70 | 100 | ACTION_FORGET = b'f' |
|
71 | 101 | ACTION_REMOVE = b'r' |
|
72 | 102 | ACTION_ADD = b'a' |
General Comments 0
You need to be logged in to leave comments.
Login now