← Back to branch summary

~abentley/bzr/status

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Aaron Bentley
  • Date: 2009-05-05 18:16:46 UTC
  • mfrom: (1912.1.23 composite-tree)
  • Revision ID: aaron@aaronbentley.com-20090505181646-362mokrtb1l4f0qv
Merge composite-tree into status

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
1403
1403
            elif state == 'conflicted-b':
1404
1404
                ch_b = ch_a = True
1405
1405
                lines_b.append(line)
 
1406
            elif state == 'killed-both':
 
1407
                # This counts as a change, even though there is no associated
 
1408
                # line
 
1409
                ch_b = ch_a = True
1406
1410
            else:
1407
1411
                if state not in ('irrelevant', 'ghost-a', 'ghost-b',
1408
 
                        'killed-base', 'killed-both'):
 
1412
                        'killed-base'):
1409
1413
                    raise AssertionError(state)
1410
1414
        for struct in outstanding_struct():
1411
1415
            yield struct