| pulkit |
| hg-reviewers |
If the two sides of the merge are the same (they come an unaltered common
ancestors) we don't need any merging.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| # copy on write to avoid affecting potential other | # copy on write to avoid affecting potential other | ||||
| # branches. when there are no other branches, this | # branches. when there are no other branches, this | ||||
| # could be avoided. | # could be avoided. | ||||
| newcopies = copies.copy() | newcopies = copies.copy() | ||||
| newcopies[f] = (c, None) | newcopies[f] = (c, None) | ||||
| othercopies = all_copies.get(c) | othercopies = all_copies.get(c) | ||||
| if othercopies is None: | if othercopies is None: | ||||
| all_copies[c] = newcopies | all_copies[c] = newcopies | ||||
| elif newcopies is othercopies: | |||||
| # nothing to merge: | |||||
| pass | |||||
| else: | else: | ||||
| # we are the second parent to work on c, we need to merge our | # we are the second parent to work on c, we need to merge our | ||||
| # work with the other. | # work with the other. | ||||
| # | # | ||||
| # In case of conflict, parent 1 take precedence over parent 2. | # In case of conflict, parent 1 take precedence over parent 2. | ||||
| # This is an arbitrary choice made anew when implementing | # This is an arbitrary choice made anew when implementing | ||||
| # changeset based copies. It was made without regards with | # changeset based copies. It was made without regards with | ||||
| # potential filelog related behavior. | # potential filelog related behavior. | ||||