[MERGE] teach shelve about filtered views

[Ben Finney]

Ian Clatworthy <ian.clatworthy at internode.on.net> writes:

> === modified file 'bzrlib/builtins.py'
> --- bzrlib/builtins.py	2009-02-21 06:33:41 +0000
> +++ bzrlib/builtins.py	2009-02-23 09:07:29 +0000
> @@ -5161,6 +5161,19 @@
>      to see the whole tree for an operation or two (e.g. merge) but
>      want to switch back to your view after that.
>  
> +    There are 3 categories of commands in terms of view handling:
> +    
> +     1. Commands that consider the view when operating, e.g.
> +        status, diff, add, commit, remove, revert and shelve.
> +        
> +     2. Commands that operate on the full tree but filter their results
> +        according to the current view, e.g. pull, update, merge.
> +
> +     3. Commands that explicitly ignore the view, e.g. log, info.
> +
> +     If a command doesn't operate as you expect, please report it
> +     as a bug.
> +
>      :Examples:
>        To define the current view::
>  

I don't know if docstrings in Bazaar code are intended to be processed
as reStructuredText, but if so, the above will be interpreted by
docutils in a way that you likely don't want.

Following the first added line (“There are …”), the next line is
indented (by 1 column), which will be interpreted as a block quote.
That block quote will continue until the indentation returns to the
same level, at “:Examples:”.

If, instead, you want the four paragraphs to be at the same structural
level as the line “There are …”, then they should all begin with
lines at the same indentation level as that line.

-- 
 \           “We have met the enemy and he is us.” —Walt Kelly, _Pogo_ |
  `\                                                        1971-04-22 |
_o__)                                                                  |
Ben Finney