← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: Martin Pool
  • Date: 2005-07-15 22:55:10 UTC
  • Revision ID: mbp@sourcefrog.net-20050715225510-ebb2753f499f71e5
- add more test cases for weave_merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
657
657
                ch_b = True
658
658
                lines_b.append(line)
659
659
            else:
660
 
                assert state in ('irrelevant', 'ghost-a', 'ghost-b', 'killed-base'), \
 
660
                assert state in ('irrelevant', 'ghost-a', 'ghost-b', 'killed-base',
 
661
                                 'killed-both'), \
661
662
                       state
662
663
 
663
664