bad merge?

[John Arbash Meinel]

-----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.

I definitely see your external_url changes being reverted in "bzr diff
- -r2613..2614".


However if you log 2614 you see:

- ------------------------------------------------------------
revno: 2614
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-07-13 05:12:12 +0100
message:
  (John Arbash Meinel) Implement _KnitIndex._load_data in pyrex.
...

    ------------------------------------------------------------
    revno: 2484.1.11
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: knit_index_pyrex
    timestamp: Thu 2007-06-28 18:55:39 -0500
    message:
      [merge] bzr.dev 2563 and add integer checking to the extension.

...

    ------------------------------------------------------------
    revno: 2484.1.24
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: knit_index_pyrex
    timestamp: Thu 2007-07-05 14:39:28 -0500
    message:
      Add direct tests of how we handle incomplete/'broken' lines
    ------------------------------------------------------------
    revno: 2484.1.25
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: knit_index_pyrex
    timestamp: Thu 2007-07-12 21:23:34 -0500
    message:
      [merge] bzr.dev 2612



And if you do a 'bzr diff -r2484.1.24..2484.1.25', you can see that the
'external_url' code *shows up* in 2484.1.25.

Something very very weird, and very very wrong happened on the pqm side,
for it to merge 2484.1.25 which *has* external_url, to cause it to
revert it relative to 2613.


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.

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

iD8DBQFGoDWnJdeBCYSNAAMRAg4EAJ9ylsJYGQWG3LOKXkJ1ctgsgHeJWgCfcGMD
jeZ+3UYMl7yE1Ceq9DljcYk=
=I/NY
-----END PGP SIGNATURE-----