[MERGE] status command analysis

[Robert Collins]

On Mon, 2007-07-02 at 00:18 -0400, Martin Pool wrote:
> Martin Pool has voted +1 (conditional).
> Status is now: Conditionally approved
> Comment:
> +Status shows several things in parallel (for the paths the user 
> supplied mapped
> +across the from and to tree, and any pending merges in the to tree).
> 
> It can also show:
> 
> * unknown files
> * files with conflicts
> * files with pending merges

What is the last point? (I don't think we show modified differently to
'modified because of a merge'). 


> +
> +- We should stat files in the same directory without reading or 
> statting
> +files in other directories.
> 
> Rephrase to: we should stat all the files in a particular directory 
> before proceeding to another directory.  (If that's what you mean.)

These statements are not equivalent. Mine has a stricter requirement on
the implementation - with your rephrasing its possible to stat a file,
read history data, stat a file, read history data.

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070702/f2157eab/attachment.pgp