[RFC] proposed user doc for nested trees

Aaron Bentley aaron at aaronbentley.com
Tue May 12 13:32:17 BST 2009


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Alexander Belchenko wrote:
> Aaron Bentley пишет:
> Martin Pool wrote:
>>>>> by-value nesting is available now and works now, either using bzr join
>>>>> or the merge-into plugin.  I realize that you're not suggesting we
>>>>> disable by-value nesting.  We would simply stop calling it nesting.
>>>> Can I check how these two are currently defined:
> 
> I'm using the definitions from UBZ.  They are the same as "copy by
> value" and "copy by reference" in programming languages.
> 
>>>> by-reference nesting: the containing tree holds basically the branch
>>>> URL and revision to be checked out under a subdirectory.
>>>>
>>>> by-value nesting: the containing tree directly contains all the files
>>>> from the nested tree as if they'd been added, but pulling or merging
>>>> from branches related to the nested tree will still work?
> 
> Copy-by-value means that the two trees become a single tree with the
> history of both.  This is implemented by the join command and the
> merge-into plugin.
> 
>> IIUC merge-into simply do `bzr merge -r0..-1` into subdirectory.
>> So nesting-by-value is just merged into with all history.
>> Is it correct?

Yes.

>> Do you plan to provide support for relative branch references?
>> https://bugs.launchpad.net/bzr/+bug/330086

No.  I don't plan any changes to branch references.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkoJbE0ACgkQ0F+nu1YWqI3hegCfe7yE2CXzajONNLzeHFVkO3Am
SDwAn0xdb3Y6ECJC9UD5ZHIeBXvGqHYx
=50jD
-----END PGP SIGNATURE-----



More information about the bazaar mailing list