Code review comment for lp:~slyguy/bzr/bug-855155

John A Meinel (jameinel) wrote :

2.3 passes, 2.4 fails. Most likely because of this change:
* Speed up ``bzr uncommit``. Instead of resetting the dirstate from
  scratch, use ``update_basis_by_delta``, computing the delta from the
  repository. (John Arbash Meinel, #780544)

So that would indicate uncommit wasn't using update_basis_by_delta prior to 2.4. So it is possible this was just a latent bug in update_basis_by_delta. In 2.3 the only caller to update_basis_by_delta was commit.

In 2.4, it is anything calling 'set_parent_trees', which is called by things like update and merge. (Which made those things a lot faster on large trees because you don't have to think about the state of all the files which haven't changed.)

Certainly it could still just be a flaw in update_basis_by_delta that we didn't trigger in testing. Since it does happen in 2.4, it might be worth backporting this fix to 2.4 as well.

« Back to merge proposal