[MERGE] #25449

[Aaron Bentley]

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

Talden 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.
> 
> Not desired... apparently you don't wait for your merges as long as some 8-o.

I think you are misreading me, and possibly misunderstanding the effect
of the code.  This code is inefficient and incorrect.  That is why I am
rejecting it.

It does not speed up merges.  It slows them down.  So if you wish merges
were faster, you should agree with my rejection.  The only thing it
speeds up is failure-- in the case where there are uncommitted changes.

It is certainly possible speed up that failure case without slowing down
merging, and I wouldn't reject such a change out of hand.

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

iEYEARECAAYFAkmmFacACgkQ0F+nu1YWqI3hdQCfduhF3qyFQvs56SSWTa58pBwd
CXIAnAr/s8ZujJVe/vuoEkH8TSN3uVYX
=o4C1
-----END PGP SIGNATURE-----