2.0 migration confusion

[Brad Schick]

On 10/30/2009 08:12 PM, Matt Nordhoff wrote:
> Brad Schick wrote:
>   
>> I am following the step here
>> http://doc.bazaar-vcs.org/latest/en/upgrade-guide/index.html to migrate
>> to the 2a format, but finding the steps unclear.
>>
>> On my server I have a shared repo with several branches and no working
>> trees. So as the docs say, I am trying
>>
>> 1. Upgrade the shared repository.
>> 2. Upgrade the branches.
>> 3. Upgrade any lightweight checkouts.
>>
>> In the top directory of the shared repo I ran
>>
>>     
>>> bzr check
>>> bzr upgrade --2a
>>> bzr check
>>>       
>> And it seems to be happy. Then moving to step #2 I change into one of
>> the branches in to repo and do
>>
>>     
>>> bzr check .
>>> bzr upgrade --2a .
>>>       
>> bzr: ERROR: The branch format Meta directory format 1 is already at the
>> most recent format.
>>
>> And get the error above. So what does setup #2 mean?
>>     
>
> "bzr check" on the repo checked all of the branches inside it (look at
> its output -- it should've mentioned them), so it's redundant to check
> them individually.
>   

Yes, bzr check did check the branches. Does that make the docs the I
referenced wrong or do they just describe some other situation?

>> Further down in the upgrade guide, there is a section titled "Migrating
>> local branches after a central trunk has migrated". Does that mean that
>> people can't upgrade the local branches and keep working as usual?
>> Everyone really needs to re-branch from the upgraded server and then
>> copy over all their changes and ignored junk?
>>
>>     

Any word on this? I'd really rather not make everyone start from
scratch. Given the distributed nature of bzr, it really surprises me
that people can't just update their local branches directly.


-Brad