1.13.2 == 1.14.xx ?

[Martin Pool]

2009/5/12 Bob Tanner <tanner at real-time.com>:
> On 2009-05-05 21:01:17 -0500, Robert Collins <robert.collins at canonical.com>
> said:
>
>> rev 4113 of the 1.13 branch seems awfully large; and stuff like 'fetch
>> streams from stacked smart branches' is in 1.13 now - stuff that I was
>> sure we only added in 1.14.
>
> I spent some time tracking down this issue and spoke with Robert in irc.
> It's ugly enough that I need to bring it to the mailing list.
>
> I would like to apologize for the mess I've created. I'll put in the
> necessary time to clean up as much of the mess as possible. Now for the
> details.
>
> I introduced this mess into the 1.13 branch when I merged
> '~spiv/bzr/stacking-inventory' as part of the fix for bug #354036
> <https://bugs.launchpad.net/bzr/+bug/354036>. The mess shows up in
> revno: 4112.1.1.
>
> There was a task for me to cherrypick the bug fix and apply it to the 1.13
> branch. I did what I thought was the right thing regarding cherrypicking,
> but Robert gave me a quick mentoring session (in irc) on how to cherrypick
> and I wasn't even close to doing the right thing. This resulted in the mess
> that is revno:4113.
>
> Now the tough questions:
>
> How do I clean this mess up? Uncommits? How far is this mess going to reach
> outside the repository?

If it's not in the release, we can uncommit from that branch, redo the
cherrypick and merge across what you should have.  You'll need to ask
a sysadmin like spm to do it; it's probably easiest to do that through
Robert. If it was in the release (I think it's not, but please check)
then it's just a fact that 1.13.2 was larger than we planned and we
might as well leave it there.

-- 
Martin <http://launchpad.net/~mbp/>