← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Martin Pool
  • Date: 2007-10-12 08:00:07 UTC
  • mto: This revision was merged to the branch mainline in revision 2913.
  • Revision ID: mbp@sourcefrog.net-20071012080007-vf80woayyom8s8e1
Rename update_to_one_parent_via_delta to more wieldy update_basis_by_delta

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
387
387
            # XXX: This will need to be changed if we support doing a
388
388
            # selective commit while a merge is still pending - then we'd
389
389
            # still have multiple parents after the commit.
390
 
            self.work_tree.update_to_one_parent_via_delta(self.rev_id,
 
390
            self.work_tree.update_basis_by_delta(self.rev_id,
391
391
                self.basis_delta)
392
392
            self.reporter.completed(new_revno, self.rev_id)
393
393
            self._process_post_hooks(old_revno, new_revno)