1.13.2 == 1.14.xx ?

[Bob Tanner]

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?

-- 
Bob Tanner <tanner at real-time.com>                  | Phone : (952 943-8700
http://www.real-time.com, Linux, OSX, VMware | Fax   : (952)943-8500
Key fingerprint = F785 DDFC CF94 7CE8 AA87 3A9D 3895 26F1 0DDB E378