← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge3.py

  • Committer: Martin Pool
  • Date: 2009-03-24 05:21:02 UTC
  • mfrom: (4192 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4202.
  • Revision ID: mbp@sourcefrog.net-20090324052102-8kk087b32tep3d9h
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge3.py
37
37
    (7, 9)
38
38
    """
39
39
    # preconditions: (ra[0] <= ra[1]) and (rb[0] <= rb[1])
40
 
    
 
40
 
41
41
    sa = max(ra[0], rb[0])
42
42
    sb = min(ra[1], rb[1])
43
43
    if sa < sb:
56
56
            return False
57
57
    else:
58
58
        return True
59
 
        
 
59
 
60
60
 
61
61
 
62
62
 
132
132
    def merge_annotated(self):
133
133
        """Return merge with conflicts, showing origin of lines.
134
134
 
135
 
        Most useful for debugging merge.        
 
135
        Most useful for debugging merge.
136
136
        """
137
137
        for t in self.merge_regions():
138
138
            what = t[0]
219
219
 
220
220
        # section a[0:ia] has been disposed of, etc
221
221
        iz = ia = ib = 0
222
 
        
 
222
 
223
223
        for zmatch, zend, amatch, aend, bmatch, bend in self.find_sync_regions():
224
224
            matchlen = zend - zmatch
225
225
            # invariants:
275
275
                # assert ia == amatch
276
276
                # assert ib == bmatch
277
277
                # assert iz == zmatch
278
 
                
 
278
 
279
279
                yield 'unchanged', zmatch, zend
280
280
                iz = zend
281
281
                ia = aend
324
324
    def reprocess_merge_regions(self, merge_regions):
325
325
        """Where there are conflict regions, remove the agreed lines.
326
326
 
327
 
        Lines where both A and B have made the same changes are 
 
327
        Lines where both A and B have made the same changes are
328
328
        eliminated.
329
329
        """
330
330
        for region in merge_regions:
410
410
                ia += 1
411
411
            else:
412
412
                ib += 1
413
 
            
 
413
 
414
414
        intbase = len(self.base)
415
415
        abase = len(self.a)
416
416
        bbase = len(self.b)
442
442
                del am[0]
443
443
            else:
444
444
                del bm[0]
445
 
                
 
445
 
446
446
        return unc
447
447
 
448
448