← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Martin Pool
  • Date: 2008-05-08 04:21:01 UTC
  • mto: This revision was merged to the branch mainline in revision 3415.
  • Revision ID: mbp@sourcefrog.net-20080508042101-c9c0dmqo4not47qm
Compare to None using is/is not not ==

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
180
180
            to_file.write(line_log(m_revision, width - len(prefix)))
181
181
            to_file.write('\n')
182
182
            inner_merges = branch.repository.get_ancestry(merge)
183
 
            if inner_merges.pop(0) != None:
 
183
            if inner_merges.pop(0) is not None:
184
184
                raise AssertionError()
185
185
            inner_merges.reverse()
186
186
            for mmerge in inner_merges: