← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-03-28 11:35:46 UTC
  • mfrom: (1616.1.18 bzr.mbp.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060328113546-b4c98b0015b7f681
(mbp) pycurl fixes, weave commands, weave merge fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
448
448
        # 
449
449
        # TODO: Show some version information (e.g. author, date) on 
450
450
        # conflicted regions.
 
451
        
 
452
        # We previously considered either 'unchanged' or 'killed-both' lines
 
453
        # to be possible places to resynchronize.  However, assuming agreement
 
454
        # on killed-both lines may be too agressive. -- mbp 20060324
451
455
        for state, line in plan:
452
 
            if state == 'unchanged' or state == 'killed-both':
 
456
            if state == 'unchanged':
453
457
                # resync and flush queued conflicts changes if any
454
458
                if not lines_a and not lines_b:
455
459
                    pass