/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Vincent Ladeuil
  • Date: 2007-11-14 08:20:26 UTC
  • mfrom: (2974 +trunk)
  • mto: (2990.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 2991.
  • Revision ID: v.ladeuil+lp@free.fr-20071114082026-4d27f52n5r0t82rw
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
384
384
 
385
385
            # Make the working tree up to date with the branch
386
386
            self._set_progress_stage("Updating the working tree")
387
 
            rev_tree = self.builder.revision_tree()
388
 
            # XXX: This will need to be changed if we support doing a
389
 
            # selective commit while a merge is still pending - then we'd
390
 
            # still have multiple parents after the commit.
391
 
            #
392
 
            # XXX: update_basis_by_delta is slower at present because it works
393
 
            # on inventories, so this is not active until there's a native
394
 
            # dirstate implementation.
395
 
            ## self.work_tree.update_basis_by_delta(self.rev_id,
396
 
            ##      self._basis_delta)
397
 
            self.work_tree.set_parent_trees([(self.rev_id, rev_tree)])
 
387
            self.work_tree.update_basis_by_delta(self.rev_id,
 
388
                 self._basis_delta)
398
389
            self.reporter.completed(new_revno, self.rev_id)
399
390
            self._process_post_hooks(old_revno, new_revno)
400
391
        finally: