> I'd really like to see the shuffling around seperated from the integration > of the tproxy4 code - ie, (at least) two seperate commits. > > I'm not sure how bzr works with merging in changes from other repos - will > there be some sort of history included, or just this one patch? >
The revision patch displays the full history of the child-branch up to the point of the merger. You can see one example at revision 8925: http://www.squid-cache.org/bzrview//squid3/trunk/revision/henrik%40henriknordstrom.net-20080407072608-y4r8flaqjb7pgoil?start_revid=squid3%40treenet.co.nz-20080409131215-gv1c3wy10d1h3pcq http://www.squid-cache.org/bzrview//squid3/trunk/changes?start_revid=henrik%40henriknordstrom.net-20080406232420-zsdp8ied4jx4x0gr I have tagged the child revision at which the tproxy4 alterations ended and the polish began, so I think we should be able to commit it as two parts when the polish is complete and accepted for merge. The polish itself has been done as a series of individual steps in the child branch so that history I mention above documents the changes clearly. For now Laszlo and I are publishing the 'dirty' tproxy4 patch for those who want it immediately.
