Alex Rousskov wrote:
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. ]
To do this type of thing in future. The safe-but-long way I do it now is: cd DESTBRANCHPATH bzr merge -rA..B SRCBRANCHPATH bzr merge -rC..D --force SRCBRANCHPATH ...repeat as necessary. bzr status - to check the commit history is there. bzr diff - to check the change is right. bzr commit ... enter the cherrypick commit message. Done.
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
Yes I will port from trunk in a day or two. It's what I'm here for ;) Amos -- Please be using Current Stable Squid 2.7.STABLE6 or 3.0.STABLE16 Current Beta Squid 3.1.0.9
