← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.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/builtins.py
2908
2908
            merger.show_base = show_base
2909
2909
            self.sanity_check_merger(merger)
2910
2910
            if (merger.base_rev_id == merger.other_rev_id and
2911
 
                merger.other_rev_id != None):
 
2911
                merger.other_rev_id is not None):
2912
2912
                note('Nothing to do.')
2913
2913
                return 0
2914
2914
            if pull: