[merge] Fix push output (bug 49742)

[Michael Ellerman]

On Sat, 2006-06-17 at 13:55 -0500, John Arbash Meinel wrote:
> === modified file 'bzrlib/builtins.py'
> --- bzrlib/builtins.py	2006-06-17 00:49:34 +0000
> +++ bzrlib/builtins.py	2006-06-17 18:53:39 +0000
> @@ -416,7 +416,8 @@
>  
>      If there is no default location set, the first pull will set it.  After
>      that, you can omit the location to use the default.  To change the
> -    default, use --remember.
> +    default, use --remember. The value will only be saved if the remote
> +    location can be accessed.
>      """
>  
>      takes_options = ['remember', 'overwrite', 'revision', 'verbose']
> @@ -506,7 +507,8 @@
>  
>      If there is no default push location set, the first push will set it.
>      After that, you can omit the location to use the default.  To change the
> -    default, use --remember.
> +    default, use --remember. The value will only be saved if the remote
> +    location can be accessed.
>      """
>  
>      takes_options = ['remember', 'overwrite', 'verbose',
> @@ -2034,7 +2036,8 @@
>  
>      If there is no default branch set, the first merge will set it. After
>      that, you can omit the branch to use the default.  To change the
> -    default, use --remember.
> +    default, use --remember. The value will only be saved if the remote
> +    location can be accessed.
>  

Looks good.

cheers
	
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060618/394dcd70/attachment.pgp