← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Martin Pool
  • Date: 2006-03-24 19:11:33 UTC
  • mto: This revision was merged to the branch mainline in revision 1626.
  • Revision ID: mbp@sourcefrog.net-20060324191133-4f45292db5c5d487
(weave-merge) don't treat killed-both lines as points of agreement; 
makes sure that killed-[ab] lines next to change reasons aren't 
omitted from conflict descriptions.

Add more weave merge tests about line deletion.

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