← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

merge olaf - InvalidRevisionId fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
171
171
            m_revision = branch.repository.get_revision(merge)
172
172
            print >> to_file, ' ', line_log(m_revision, 77)
173
173
            inner_merges = branch.repository.get_ancestry(merge)
 
174
            assert inner_merges[0] == None
 
175
            inner_merges.pop(0)
174
176
            inner_merges.reverse()
175
177
            for mmerge in inner_merges:
176
178
                if mmerge in ignore: