equal
deleted
inserted
replaced
125 # actions which are no op |
125 # actions which are no op |
126 NO_OP_ACTIONS = ( |
126 NO_OP_ACTIONS = ( |
127 ACTION_KEEP, |
127 ACTION_KEEP, |
128 ACTION_KEEP_ABSENT, |
128 ACTION_KEEP_ABSENT, |
129 ACTION_KEEP_NEW, |
129 ACTION_KEEP_NEW, |
|
130 ) |
|
131 |
|
132 # Used by concert to detect situation it does not like, not sure what the exact |
|
133 # criteria is |
|
134 CONVERT_MERGE_ACTIONS = ( |
|
135 ACTION_MERGE, |
|
136 ACTION_DIR_RENAME_MOVE_LOCAL, |
|
137 ACTION_CHANGED_DELETED, |
|
138 ACTION_DELETED_CHANGED, |
130 ) |
139 ) |
131 |
140 |
132 |
141 |
133 class _mergestate_base(object): |
142 class _mergestate_base(object): |
134 """track 3-way merge state of individual files |
143 """track 3-way merge state of individual files |