[MERGE] Stacking policy

[Jonathan Lange]

On Fri, Jun 20, 2008 at 4:04 AM, Aaron Bentley <aaron at aaronbentley.com> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hi all,
>
> This patch implements policy for stacking branches.
>

Woot!

> === modified file 'bzrlib/bzrdir.py'
> --- bzrlib/bzrdir.py	2008-06-16 19:00:15 +0000
> +++ bzrlib/bzrdir.py	2008-06-19 17:39:54 +0000
> @@ -39,6 +39,7 @@
>
>  import bzrlib
>  from bzrlib import (
> +    config,
>      errors,
>      graph,
>      lockable_files,
> @@ -155,7 +156,8 @@
>                  format.get_format_description(),
>                  basedir)
>
> -    def clone(self, url, revision_id=None, force_new_repo=False):
> +    def clone(self, url, revision_id=None, force_new_repo=False,
> +              preserve_stacking=False):
>          """Clone this bzrdir and its contents to url verbatim.
>
>          If url's last component does not exist, it will be created.


If I understand correctly, older BzrDirs will need to be updated to
accept this new parameter.

For my use case — automated initial mirrors of stacked branches — they
could either silently ignore the parameter or raise some sort of
distinguishable error when preserve_stacking is True.

I'll try to write a patch for this today, but can't make any promises.

jml