← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Aaron Bentley
  • Date: 2007-12-28 20:26:04 UTC
  • mto: (3144.5.2 specific-file)
  • mto: This revision was merged to the branch mainline in revision 3156.
  • Revision ID: abentley@panoramicfeedback.com-20071228202604-kkolnauo09glnsbh
Get conflict handling working

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
669
669
            elif state == 'new-b':
670
670
                ch_b = True
671
671
                lines_b.append(line)
 
672
            elif state == 'conflicted-a':
 
673
                ch_b = ch_a = True
 
674
                lines_a.append(line)
 
675
            elif state == 'conflicted-b':
 
676
                ch_b = ch_a = True
 
677
                lines_b.append(line)
672
678
            else:
673
679
                assert state in ('irrelevant', 'ghost-a', 'ghost-b', 
674
680
                                 'killed-base', 'killed-both'), state