/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
819
819
                ch_b = ch_a = True
820
820
                lines_b.append(line)
821
821
            else:
822
 
                assert state in ('irrelevant', 'ghost-a', 'ghost-b', 
823
 
                                 'killed-base', 'killed-both'), state
 
822
                if state not in ('irrelevant', 'ghost-a', 'ghost-b',
 
823
                        'killed-base', 'killed-both'):
 
824
                    raise AssertionError(state)
824
825
        for struct in outstanding_struct():
825
826
            yield struct
826
827