[MERGE] Re: Strange problem with bzr 1.6.1 (and 1.7rc1)

[David Ingamells]

>
> David Ingamells wrote:
>   
>> Could this be the cause of the branch --stacked problem I reported a  
>> couple of days ago (bzr-1.7rc1 bzr branch --stacked problem/question)?
>>     
>
> To be honest, I'm not sure.  It seems possible, but I'm not very familiar with
> the stacking code yet.  Feel free to test my patch and see if it helps!
>
> -Andrew.
>
>
>   
Unfortunately it doesn't :-(
This all works fine with 1.6.1rc1

## the source branch is like this as seen by the client machine:

$ /data/users/david.ingamells/bazaar/bzr.dev/bzr info -v 
bzr+ssh://mscvs01/home/CmsRoot/repos/CVTOOL/Toto_1.0
Repository branch (format: unnamed)
Location:
  shared repository: bzr+ssh://mscvs01/home/CmsRoot/repos/CVTOOL/
  repository branch: bzr+ssh://mscvs01/home/CmsRoot/repos/CVTOOL/Toto_1.0/

Related branches:
  parent branch: bzr+ssh://mscvs01/home/CmsRoot/repos/CVTOOL/Racoon_1.0/

Format:
       control: bzr remote bzrdir
        branch: Remote BZR Branch
    repository: bzr remote repository

Branch history:
      3705 revisions
        22 committers
       236 days old
   first revision: Tue 2008-01-22 07:39:26 +0100
  latest revision: Fri 2008-09-12 16:38:16 +0200

Repository:
      7208 revisions

## and like this when seen locally

$ /home/CmsRoot/repos/CVTOOL/Toto_1.0$ bzr info -v
Repository branch (format: pack-0.92)
Location:
  shared repository: /home/CmsRoot/repos/CVTOOL
  repository branch: .

Related branches:
  parent branch: /home/CmsRoot/repos/CVTOOL/Racoon_1.0

Format:
       control: Meta directory format 1
        branch: Branch format 6
    repository: Packs containing knits without subtree support

Branch history:
      3705 revisions
        22 committers
       236 days old
   first revision: Tue 2008-01-22 07:39:26 +0100
  latest revision: Fri 2008-09-12 16:38:16 +0200

Repository:
      7208 revisions

## just to prove that I'm not positioned in a shared repos:

$ bzr info
bzr: ERROR: Not a branch: "/volumes0/david/temp/".
$ ls -a
.  ..

## Call bzr from a just-created bzr.dev with Andrew's patch:

$ /data/users/david.ingamells/bazaar/bzr.dev/bzr branch --stacked 
bzr+ssh://mscvs01/home/CmsRoot/repos/CVTOOL/Toto_1.0 CVT_t1.0
Source format does not support stacking, using format: '1.6'
  Packs 5 (adds stacking support, requires bzr 1.6)

bzr: ERROR: The branch 'file:///volumes0/david/temp/CVT_t1.0/'(Bazaar 
Branch Format 6 (bzr 0.15)) is not a stackable format. You will need to 
upgrade the branch to permit branch stacking.

## There is now a partially made target branch:

$ bzr info -v CVT_t1.0
Standalone branch (format: unnamed)
Location:
  branch root: .

Related branches:
  parent branch: bzr+ssh://mscvs01/home/CmsRoot/repos/CVTOOL/Toto_1.0/

Format:
       control: Meta directory format 1
        branch: Branch format 6
    repository: Packs 5 (adds stacking support, requires bzr 1.6)

Branch history:
         0 revisions
         0 committers

Repository:
         0 revisions



-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20080915/117f9be1/attachment.htm