Re: [MERGE] Merged from trunk

2008-04-09 Thread Amos Jeffries
> 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

Re: [MERGE] Merged from trunk

2008-04-09 Thread Robert Collins
On Wed, 2008-04-09 at 12:07 -0600, Alex Rousskov wrote: > On Wed, 2008-04-09 at 22:47 +0800, Adrian Chadd wrote: > > I'd really like to see the shuffling around seperated from the integration > > of the tproxy4 code - ie, (at least) two seperate commits. > > I expect separate commits as well. When

Re: [MERGE] Merged from trunk

2008-04-09 Thread Alex Rousskov
On Wed, 2008-04-09 at 22:47 +0800, Adrian Chadd wrote: > I'd really like to see the shuffling around seperated from the integration > of the tproxy4 code - ie, (at least) two seperate commits. I expect separate commits as well. When somebody commits to trunk, they commit the results of one project

Re: [MERGE] Merged from trunk

2008-04-09 Thread Adrian Chadd
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? Adrian On Thu, Apr 1

Re: [MERGE] Merged from trunk

2008-03-24 Thread Henrik Nordstrom
bb:approve On Mon, 2008-03-24 at 00:03 +1200, Amos Jeffries wrote: > Replace a goto with do-while.

[MERGE] Merged from trunk

2008-03-23 Thread Amos Jeffries
Replace a goto with do-while. # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [EMAIL PROTECTED] # target_branch: file:///src/squid/bzr/trunk/ # testament_sha1: 667ca44f308a53d0a2a79eb11cc8ad64b41a8fdf # timestamp: 2008-03-24 00:02:13 +1200 # base_revision_id: [EMAIL PROTECTED] # jm