equal
deleted
inserted
replaced
118 ACTION_CHANGED_DELETED = b'cd' |
118 ACTION_CHANGED_DELETED = b'cd' |
119 ACTION_MERGE = b'm' |
119 ACTION_MERGE = b'm' |
120 ACTION_LOCAL_DIR_RENAME_GET = b'dg' |
120 ACTION_LOCAL_DIR_RENAME_GET = b'dg' |
121 ACTION_DIR_RENAME_MOVE_LOCAL = b'dm' |
121 ACTION_DIR_RENAME_MOVE_LOCAL = b'dm' |
122 ACTION_KEEP = b'k' |
122 ACTION_KEEP = b'k' |
|
123 # the file was absent on local side before merge and we should |
|
124 # keep it absent (absent means file not present, it can be a result |
|
125 # of file deletion, rename etc.) |
|
126 ACTION_KEEP_ABSENT = b'ka' |
123 ACTION_EXEC = b'e' |
127 ACTION_EXEC = b'e' |
124 ACTION_CREATED_MERGE = b'cm' |
128 ACTION_CREATED_MERGE = b'cm' |
125 |
129 |
126 |
130 |
127 class mergestate(object): |
131 class mergestate(object): |
835 |
839 |
836 # keep |
840 # keep |
837 for f, args, msg in actions.get(ACTION_KEEP, []): |
841 for f, args, msg in actions.get(ACTION_KEEP, []): |
838 pass |
842 pass |
839 |
843 |
|
844 # keep deleted |
|
845 for f, args, msg in actions.get(ACTION_KEEP_ABSENT, []): |
|
846 pass |
|
847 |
840 # get |
848 # get |
841 for f, args, msg in actions.get(ACTION_GET, []): |
849 for f, args, msg in actions.get(ACTION_GET, []): |
842 if branchmerge: |
850 if branchmerge: |
843 repo.dirstate.otherparent(f) |
851 repo.dirstate.otherparent(f) |
844 else: |
852 else: |