[MERGE][Bug #113436] bzr pull --help should explain the status flags

[Daniel Watkins]

Hi James,

Thanks for the feedback! :)

James Westby wrote:
>> +
>> +    Changes that are pulled from the parent branch are summarised using status
>> +    flags.  For more information about status flags, see 'help status-flags'.
>>      """
> 
>> +
>> +    Updates from running this will be summarised using status flags.
>> +    For more information about status flags, see 'help status-flags'.
>>      """
> 
>>  
>> +    The changes merged are summarised using status flags.  For more information
>> +    about status flags, see 'help status-flags'.
>> +
> 
> These three could be done like this, or using _see_also, but I don't have
> a strong opinion. Did you consider this choice?
I had not, as I was not aware of it.  It makes a lot more sense than
adding an identical string to all of the help, so is in the attached.

>> +topic_registry.register('status-flags', _status_flags,
>> +                        "Help on status flags.")
> 
> There, is no test for this, but it's not that important. See
> bzrlib/tests/blackbox/test_help.py and the tests for 'help
> working-trees' for an easy test to copy.
See attached.

Also, James, apologies for the personal mail, I _keep_ forgetting that
the reply-to address of this list isn't the list itself.


Thanks,
Dan
-- 
Daniel Watkins (Odd_Bloke)
University of Warwick Christian Focus President
University of Warwick Computing Society WUGLUG Liaison Officer

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 113436.1.patch
Type: text/x-patch
Size: 10492 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070608/a82dcb02/attachment-0001.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 252 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070608/a82dcb02/attachment-0001.pgp