← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-07-21 16:36:03 UTC
  • mfrom: (2644.1.2 bug-127115)
  • Revision ID: pqm@pqm.ubuntu.com-20070721163603-p17kh2wgzkhbef1d
Fix bug #127115 by checking for self.other_rev_id being None in Merger.set_pending()

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
164
164
        self.interesting_files = file_list
165
165
 
166
166
    def set_pending(self):
167
 
        if not self.base_is_ancestor or not self.base_is_other_ancestor:
 
167
        if not self.base_is_ancestor or not self.base_is_other_ancestor or self.other_rev_id is None:
168
168
            return
169
169
        self._add_parent()
170
170