On Mon, Mar 26, 2012 at 03:21:16PM -0000, Vincent Ladeuil wrote:
> Public bug reported:
>
> Weird stuff, I wanted to merge bzr-webdav into bzr:
>
> $ bzr branch lp:bzr merging-webdav
> Branched 6511 revisions.
> $ cd merging-webdav/bzrlib/plugins
> Branched 74 revisions.
> $ bzr branch lp:bzr-webdav webdav
> bzr join webdav
> bzr: ERROR: Cannot join webdav. Trees have the same root
>
> Yeah, sure, the other has bells on it ?
>
> $ cd webdav
> $ bzr file-id .
> TREE_ROOT
>
> err
>
> $ cd ../../..
> $ bzr file-id .
> TREE_ROOT
>
> Doh !
>
> Not sure what we want to do there... I realise there was no point in
> changing the root-id when we upgraded to rich-root formats but ... should we
> have a way to *change* a root-id ?
I think so. I think having a way of refreshing a file id of a
particular file (not just the root) would be useful.
On Mon, Mar 26, 2012 at 03:21:16PM -0000, Vincent Ladeuil wrote: webdav/ bzrlib/ plugins
> Public bug reported:
>
> Weird stuff, I wanted to merge bzr-webdav into bzr:
>
> $ bzr branch lp:bzr merging-webdav
> Branched 6511 revisions.
> $ cd merging-
> Branched 74 revisions.
> $ bzr branch lp:bzr-webdav webdav
> bzr join webdav
> bzr: ERROR: Cannot join webdav. Trees have the same root
>
> Yeah, sure, the other has bells on it ?
>
> $ cd webdav
> $ bzr file-id .
> TREE_ROOT
>
> err
>
> $ cd ../../..
> $ bzr file-id .
> TREE_ROOT
>
> Doh !
>
> Not sure what we want to do there... I realise there was no point in
> changing the root-id when we upgraded to rich-root formats but ... should we
> have a way to *change* a root-id ?
I think so. I think having a way of refreshing a file id of a
particular file (not just the root) would be useful.
Cheers,
Jelmer