<html><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><div><div>On Feb 25, 2009, at 8:08 PM, Aaron Bentley wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div>-----BEGIN PGP SIGNED MESSAGE-----<br>Hash: SHA1<br><br>Talden wrote:<br><blockquote type="cite"><blockquote type="cite"><blockquote type="cite">[...]</blockquote></blockquote></blockquote><blockquote type="cite">Not desired... apparently you don't wait for your merges as long as some 8-o.<br></blockquote><br>I think you are misreading me, and possibly misunderstanding the effect<br>of the code.  This code is inefficient and incorrect.  That is why I am<br>rejecting it.<br><br>It does not speed up merges.  It slows them down.</div></blockquote><div><br></div><div>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.  ;)</div><div><br></div><blockquote type="cite"><div>So if you wish merges<br>were faster, you should agree with my rejection.  The only thing it<br>speeds up is failure-- in the case where there are uncommitted changes.<br><br>It is certainly possible speed up that failure case without slowing down<br>merging, and I wouldn't reject such a change out of hand.<br></div></blockquote></div><br><div>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.</div><div><br></div><div>I've attached a revised merge directive; these are the changes in the patch:</div><div><br></div><div><a href="http://bazaar.launchpad.net/~bertosmailbox/bzr/bzr/revision/4039">http://bazaar.launchpad.net/~bertosmailbox/bzr/bzr/revision/4039</a></div><div><a href="http://bazaar.launchpad.net/~bertosmailbox/bzr/bzr/revision/4040">http://bazaar.launchpad.net/~bertosmailbox/bzr/bzr/revision/4040</a></div><div><br></div><div>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.</div><div><br></div><div>Thanks!</div><div>-Roberto.</div><div><br></div><div></div></body></html>