← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Robey Pointer
  • Date: 2006-09-03 00:28:18 UTC
  • mfrom: (1981 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1996.
  • Revision ID: robey@lag.net-20060903002818-71ca5c7bfea93a26
merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
183
183
        ancestry = self.this_branch.repository.get_ancestry(self.this_basis)
184
184
        if self.other_rev_id in ancestry:
185
185
            return
186
 
        self.this_tree.add_pending_merge(self.other_rev_id)
 
186
        self.this_tree.add_parent_tree((self.other_rev_id, self.other_tree))
187
187
 
188
188
    def set_other(self, other_revision):
189
189
        other_branch, self.other_tree = _get_tree(other_revision,