Re: bzr repository upgraded to 2a format and restructured

2012-10-16 Thread Henrik Nordström
tis 2012-10-16 klockan 05:39 +0200 skrev Eliezer Croitoru: I did that already and I get error while updating: ##start $ bzr update Doing on-the-fly conversion from RepositoryFormat2a() to RepositoryFormatKnitPack6(). This may take some time. Upgrade the repositories to the same format

Re: bzr repository upgraded to 2a format and restructured

2012-10-16 Thread Eliezer Croitoru
On 10/16/2012 6:00 AM, Alex Rousskov wrote: It looks like you failed to upgrade your local repository and/or the trunk checkout. I am not sure which directory you typed the above commands in, but what output do the following commands produce? cd/home/eliezer/squid-repo/ bzr upgrade

Re: bzr repository upgraded to 2a format and restructured

2012-10-15 Thread Eliezer Croitoru
On 9/13/2012 1:25 AM, Henrik Nordström wrote: As per prior discussions the bzr repository have now been upgraded to 2a format. New master repository layout is a flat layout with branches trunk 3.2 3.1 3.0 more branches will be migrated over on a need basis. There is also

Re: bzr repository upgraded to 2a format and restructured

2012-10-15 Thread Amos Jeffries
On 16.10.2012 14:39, Eliezer Croitoru wrote: On 9/13/2012 1:25 AM, Henrik Nordström wrote: As per prior discussions the bzr repository have now been upgraded to 2a format. New master repository layout is a flat layout with branches trunk 3.2 3.1 3.0 more branches will be

Re: bzr repository upgraded to 2a format and restructured

2012-10-15 Thread Eliezer Croitoru
On 10/16/2012 3:48 AM, Amos Jeffries wrote: cd /path/to/local/trunk/checkout bzr update cd /your/branch/directory bzr merge /path/to/local/trunk/checkout(squid-new/trunk in the above example) I did that already and I get error while updating: ##start $ bzr update Doing

Re: bzr repository upgraded to 2a format and restructured

2012-10-15 Thread Alex Rousskov
On 10/15/2012 09:39 PM, Eliezer Croitoru wrote: I give the upgrade --2a and then update and it's showing some error which seems to me better to not solve and instead just use a new branch. Please always paste the errors when reporting a problem, especially when unsure what they mean. On

bzr repository upgraded to 2a format and restructured

2012-09-12 Thread Henrik Nordström
As per prior discussions the bzr repository have now been upgraded to 2a format. New master repository layout is a flat layout with branches trunk 3.2 3.1 3.0 more branches will be migrated over on a need basis. There is also branches/... symlinks in place so old branch URLs