/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/status.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
177
177
            m_revision = branch.repository.get_revision(merge)
178
178
            print >> to_file, ' ', line_log(m_revision, width - 3)
179
179
            inner_merges = branch.repository.get_ancestry(merge)
180
 
            assert inner_merges[0] == None
 
180
            assert inner_merges[0] is None
181
181
            inner_merges.pop(0)
182
182
            inner_merges.reverse()
183
183
            for mmerge in inner_merges: