← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

Cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
501
501
                ch_b = True
502
502
                lines_b.append(line)
503
503
            else:
504
 
                assert state in ('irrelevant', 'ghost-a', 'ghost-b', 'killed-base',
505
 
                                 'killed-both'), \
506
 
                       state
 
504
                assert state in ('irrelevant', 'ghost-a', 'ghost-b', 
 
505
                                 'killed-base', 'killed-both'), state
507
506
 
508
507
 
509
508
class InterVersionedFile(InterObject):