Re: Trying to start using bzr

2008-04-07 Thread Henrik Nordstrom
mån 2008-04-07 klockan 07:17 +0200 skrev Kinkie: rsync://squid-cache.org/source/squid-version where version is one of 3, 3.0, 2, 2.7, 2.6 I've added documentation for this on the wiki in DeveloperResources. Thanks Regards Henrik

Re: Trying to start using bzr

2008-04-06 Thread Guido Serassio
Hi Henrik, Finally I have found some time to continue my bootstrap with bzr. At 20:43 31/03/2008, Henrik Nordstrom wrote: Your SQUID_NT_3_0 branch is /bzr/squid3/branches/SQUID_NT_3_0 But I have to ask Robert how we best continue the merge process on that branch.. I suspect it would

Re: Trying to start using bzr

2008-04-06 Thread Henrik Nordstrom
sön 2008-04-06 klockan 16:48 +0200 skrev Guido Serassio: My needs are: - A Windows specific development/stable branch based on the STABLE branch, so, now there is Which I question, but we had that discussion already. SQUID_NT_3_0 based on SQUID_3_0, likely in the future will be

Re: Trying to start using bzr

2008-04-06 Thread Guido Serassio
Hi Henrik, At 17:56 06/04/2008, Henrik Nordstrom wrote: What is the better solution ? My vote is that you create a new private branch from 3.0 for fixing Windows specific issues, apply the latest NT patch there and select a suitable location to publish the tree at. Suggested hosts are -

Re: Trying to start using bzr

2008-04-06 Thread Henrik Nordstrom
sön 2008-04-06 klockan 18:44 +0200 skrev Guido Serassio: If I'm not wrong, the needed steps are listed in the Merge another branch into yours section. The SOURCE_OF_FOO branch must be already locally checked-out, right ? Not unless you want to.. but if you follow the instructions it will be.

Re: Trying to start using bzr

2008-04-06 Thread Kinkie
Actually when thinking of it I think we should provide an rsync source for current Squid sources.. Done. rsync://squid-cache.org/source/squid-version where version is one of 3, 3.0, 2, 2.7, 2.6 I've added documentation for this on the wiki in DeveloperResources. -- /kinkie

Re: Trying to start using bzr

2008-04-01 Thread Amos Jeffries
Amos Jeffries wrote: tis 2008-04-01 klockan 09:23 +1100 skrev Robert Collins: On Mon, 2008-03-31 at 20:43 +0200, Henrik Nordstrom wrote: But I have to ask Robert how we best continue the merge process on that branch.. I suspect it would actually be best to recreate the branch as a new bzr

Re: Trying to start using bzr

2008-04-01 Thread Henrik Nordstrom
tis 2008-04-01 klockan 15:13 +1300 skrev Amos Jeffries: So whats with the branch SQUID_NT_3_0 already in bzr? as shown here: http://www.squid-cache.org/bzrview/ It's the import of the SQUID_NT_3_0 branch from CVS. But CVS do not have the same merge details as bzr so the import doesn't know

Re: Trying to start using bzr

2008-03-31 Thread Henrik Nordstrom
sön 2008-03-30 klockan 16:37 -0600 skrev Alex Rousskov: My understanding is that no CVS branches other than trunk and squid3-ecap have been ported or moved to bzr. The decision to move is up to the branch maintainer. Everything in the main squid3 CVS repository has been migrated to bzr,

Re: Trying to start using bzr

2008-03-31 Thread Robert Collins
On Mon, 2008-03-31 at 20:43 +0200, Henrik Nordstrom wrote: But I have to ask Robert how we best continue the merge process on that branch.. I suspect it would actually be best to recreate the branch as a new bzr branch from trunk, if it's kept at all... We can manually sync it up quite

Re: Trying to start using bzr

2008-03-31 Thread Henrik Nordstrom
tis 2008-04-01 klockan 09:23 +1100 skrev Robert Collins: On Mon, 2008-03-31 at 20:43 +0200, Henrik Nordstrom wrote: But I have to ask Robert how we best continue the merge process on that branch.. I suspect it would actually be best to recreate the branch as a new bzr branch from

Re: Trying to start using bzr

2008-03-31 Thread Amos Jeffries
tis 2008-04-01 klockan 09:23 +1100 skrev Robert Collins: On Mon, 2008-03-31 at 20:43 +0200, Henrik Nordstrom wrote: But I have to ask Robert how we best continue the merge process on that branch.. I suspect it would actually be best to recreate the branch as a new bzr branch from

Re: Trying to start using bzr

2008-03-30 Thread Alex Rousskov
On Sun, 2008-03-30 at 17:10 +0200, Guido Serassio wrote: - What are the branches currently available ? I need to work on old SQUID-3_0 and SQUID_NT_3.0 - I don't know at all the bzr architecture, so what is the bzr procedure equivalent to CVS checkout/update/commit ? My understanding is