Re: bzr repository upgraded to 2a format and restructured

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 migrated over on a need basis.
>>
>> There is also branches/... symlinks in place so old branch URLs
>> continue
>> to work as well for those branches.
>>
>> Unfortunately upgrading to 2a means you need to upgrade your local
>> repository as well if you haven't already or you won't be able to
>> pull
>> changes from the master repository. There is a couple of methods for
>> doing that depending on if you are impatient or lazy
>>
>> The simple but slow method is by running
>>
>> bzr upgrade --2a
> I used CHECKOUT and it seems to not work.
> 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.
>
>>
>> this will upgrade your repository in-place to 2a format, but due to
>> the
>> fairly long history of Squid it takes a while as it replays the
>> whole
>> history to the new format.
>>
>> A somewhat faster method is to create a new repository branching
>> from
>> the master 2a repository, and then migrate over your branches there.
>> An
>> example of that follows
>>
>> bzr init-repo squid-new
>>
>> bzr branch bzr+ssh://bzr.squid-cache.org/bzr/squid3/trunk
>> squid-new/trunk
>>
>> bzr branch bzr+ssh://bzr.squid-cache.org/bzr/squid3/3.2
>> squid-new/3.2
>>
>> [repeat for each version you need]
>>
>> bzr branch path/to/local-branch-1 squid-new/local-branch-1
>>
>> [repeat for each local branch]
>>
> I initialized a branch and I have diff from revision 12317.
> How would I patch the branch?
> now it's on revision 12396.

   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)

then resolve any conflicts, commit (we usually label such merges "merge
from trunk") and re-test.

Amos
Received on Tue Oct 16 2012 - 01:49:02 MDT