[MERGE] #25449

[Aaron Bentley]

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

I may look at your patch later, but for the moment, please note: the
formatting of your email is breaking bundle buggy.  Please do not send
further emails in this format until I can diagnose the problem and fix
bundle buggy.

Roberto Aguilar wrote:
> On Feb 25, 2009, at 8:08 PM, Aaron Bentley wrote:
> 
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> Talden wrote:
>>>>> [...]
>>> 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.
> 
> Compare this delay to connecting to a remote branch over ssh or run
> merge on a bzrsvn branch, and 0.8 seconds is instantaneous in
> comparison.  That said, bzr can be slow at times and I wouldn't want to
> make it worse.  ;)
> 
>> 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.
> 
> I do not disagree with your assessment.  The patch I submitted can
> definitely be improved, especially if it's incorrect!  After looking at
> the code a little more, I think I've come up with a better solution and
> I hope this is more in the right direction than the last.  It now uses
> more or less the same logic in the merger object and also keeps the
> merger object from performing the same check later on.
> 
> I've attached a revised merge directive; these are the changes in the patch:
> 
> http://bazaar.launchpad.net/~bertosmailbox/bzr/bzr/revision/4039
> http://bazaar.launchpad.net/~bertosmailbox/bzr/bzr/revision/4040
> 
> Please let me know if there is anything else I can do to make this
> better.  One thing I'd like to figure out is how to share this code with
> merge.py or vice versa because the stuff I added is pretty much the same.
> 
> Thanks!
> -Roberto.
> 
> 
> ------------------------------------------------------------------------
> 
> 

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

iEYEARECAAYFAkmmSZIACgkQ0F+nu1YWqI3t4gCaAgsXi1rbPxi0k1ziqQas7F3Q
yp4An2lrS0VeuUwyzvS3dXrzxxQzVsWS
=xi6h
-----END PGP SIGNATURE-----