← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-05-17 08:50:40 UTC
  • mfrom: (1704.2.18 bzr.mbp.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060517085040-ee6e33957c557fba
(mbp) merge 0.8 fixes; fix #32587

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: