Re: Importing recent trunk changes to 3.1

Hello,

    Thank you to all who responded! It sounds like there is consensus
that the changes should be imported.

When I committed the changes to trunk, I merged them from the 3p1-plus
branch on lp, using the cherrypicking method suggested by Robert:

  trunk% bzr merge -r branch:../v3.1..branch:3p1-plus ../3p1-plus

The 3p1-plus branch is based on the official 3.1 branch and contains all
of the approved changes. Thus, the above command means, roughly, "merge
the accumulated changes on 3p1-plus branch" into trunk.

[ Unfortunately, bzr does not copy commit history when cherrypicking
(yet). So my plan to preserve that in trunk failed. ]

I am not sure how we should import the changes to the official 3.1
branch now:

  1) Merge from 3p1-plus (will preserve commit history, I think!)
  2) Cherrypick from trunk (may help with future cherrupicking?)

Robert, what is the best strategy here?

Amos, will you do the import? The 3p1-plus branch, if you need it, is at
https://code.launchpad.net/~rousskov/squid/3p1-plus

Thank you,

Alex.

On 07/13/2009 05:04 AM, Henrik Nordstrom wrote:
> mån 2009-07-13 klockan 14:53 +1200 skrev Amos Jeffries:
>> Lets kick the vote off now then....
>
> +1 on both I suppose, assuming the code has been reasonably tested
> already and can easily be backported to 3.1. But ultimately it's your
> call.
>
> On the down side 3.1 is already quite delayed as it is...
>
> Another alternative is to plan for a short-term 3.2 feature release
> between 3.1 and 3.2 with reasonable feature backports where possible..
> possibly even dropping some code from current 3.1 if that would help 3.1
> getting out sooner. But this probably costs even more developer time.
>
> Regards
> Henrik
Received on Tue Jul 14 2009 - 23:37:52 MDT