bad merge?

[Robert Collins]

On Thu, 2007-07-19 at 23:10 -0500, John Arbash Meinel wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Robert Collins wrote:
> > Johns merge 2614 into bzr.dev backed out my 2592 change to the the smart
> > server. I'm wondering what else got corrupted ? As far as I can tell
> > that was the only glitch though.
> > 
> > I'm sending the transport changes back in now.
> > 
> > -Rob
> 
> Well, as near as I can tell, it had to happen on the PQM side.

2484.1.25 john at arbash-meinel.com-20070713022334-qb6ewgo6v4251yd9 does it
according to gannotate.

... aha I should read the whole mail first :).


> I can, however, reproduce this locally with:
> 
> bzr checkout bzr.dev -r 2613 bzr-2613
> bzr checkout bzr.dev -r 2484.1.25 bzr-2484.1.25
> cd bzr-2613
> bzr merge ../bzr-2484.1.25
> 
> 
> Looking a bit closer, it looks like my 2484.1.25 is a bad merge of 2612.
> I don't know why that happened. It seems like it did indeed revert some
> bits of what you changed. For some reason the external_url is not
> present in transport/__init__.py. If I do the merge over again (checkout
> 2484.1.24 and merge 2612, everything looks good).
> 
> I assume this was user error on my part. But how I could have surgically
> removed just the changes you would have done... I have no idea.

:)

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070720/5b6218e9/attachment.pgp