[MERGE] #25449

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Roberto Aguilar wrote:
> Hello,
> 
> This is a patch for bug 25449:
> 
> https://bugs.launchpad.net/bzr/+bug/254449
> 
> It speeds up the error message when merging with uncommitted changes.

I appreciate your wish to improve the Bazaar user experience, however
this change is not desired.

Adding Tree.changes_from may speed up the failure when there are
uncommitted changes, but it slows down the success when there are no
uncommitted changes.

It is also inaccurate, because it only handles the case where there are
uncommitted text modifications.  It doesn't handle uncommitted renames,
adds, deletes, etc.

We originally delayed the check for uncommitted files because we thought
it was desirable to retrieve the remote branch.  If that's no longer the
case, we should move the current check earlier, not add a second check.

(I'd bb:reject, but your mail seems to have confused Bundle Buggy, so
your patch hasn't been recorded there.)

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkmmDcIACgkQ0F+nu1YWqI0BMACfcUfkFs+IxdQdZxIbGQEIN2ZL
dUIAnRhZTjp6FKOeq5QqgnjcQlEPjEd3
=jtUf
-----END PGP SIGNATURE-----