← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-04-01 13:37:04 UTC
  • mfrom: (5128.2.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100401133704-eo1imatu4ipjqaq4
(vila) Uncontroversial cleanups, mostly comments

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1015
1015
                        continue
1016
1016
                else:
1017
1017
                    raise AssertionError('unhandled kind: %s' % other_ie.kind)
1018
 
                # XXX: We need to handle kind == 'symlink'
1019
1018
 
1020
1019
            # If we have gotten this far, that means something has changed
1021
1020
            result.append((file_id, content_changed,
1110
1109
 
1111
1110
    @staticmethod
1112
1111
    def _three_way(base, other, this):
1113
 
        #if base == other, either they all agree, or only THIS has changed.
1114
1112
        if base == other:
 
1113
            # if 'base == other', either they all agree, or only 'this' has
 
1114
            # changed.
1115
1115
            return 'this'
1116
1116
        elif this not in (base, other):
 
1117
            # 'this' is neither 'base' nor 'other', so both sides changed
1117
1118
            return 'conflict'
1118
 
        # "Ambiguous clean merge" -- both sides have made the same change.
1119
1119
        elif this == other:
 
1120
            # "Ambiguous clean merge" -- both sides have made the same change.
1120
1121
            return "this"
1121
 
        # this == base: only other has changed.
1122
1122
        else:
 
1123
            # this == base: only other has changed.
1123
1124
            return "other"
1124
1125
 
1125
1126
    @staticmethod
1169
1170
                # only has an lca value
1170
1171
                return 'other'
1171
1172
 
1172
 
        # At this point, the lcas disagree, and the tips disagree
 
1173
        # At this point, the lcas disagree, and the tip disagree
1173
1174
        return 'conflict'
1174
1175
 
1175
1176
    @staticmethod