[MERGE][93947] Overwrite conflicting tags by push|pull --overwrite.

[Alexander Belchenko]

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

bb:tweak

> === modified file 'bzrlib/tag.py'
> --- bzrlib/tag.py	2007-04-19 19:28:39 +0000
> +++ bzrlib/tag.py	2007-09-07 11:37:13 +0000
> @@ -62,7 +62,7 @@
>      lookup_tag = _not_supported
>      delete_tag = _not_supported
>  
> -    def merge_to(self, to_tags):
> +    def merge_to(self, to_tags, overwrite=None):
>          # we never have anything to copy
>          pass
>  
> @@ -170,7 +170,7 @@
>              raise ValueError("failed to deserialize tag dictionary %r: %s"
>                  % (tag_content, e))
>  
> -    def merge_to(self, to_tags):
> +    def merge_to(self, to_tags, overwrite=False):
>          """Copy tags between repositories if necessary and possible.
>          
>          This method has common command-line behaviour about handling 

I'd like to see consistency between two methods above --
default value for overwrite in both cases should be the same, IMO:
overwrite=False

[µ]

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFG5RwSzYr338mxwCURAjH/AJ9Z4pJSI2vKrmkoGg14nJSj0cmMzQCfYsps
MrFyL3AXrxK5J/Y+zPIYKX4=
=a0P0
-----END PGP SIGNATURE-----