Rev 2568: Review feedback. in sftp://rookery/~/public_html/baz2.0/repository

[Robert Collins]

At sftp://rookery/~/public_html/baz2.0/repository

------------------------------------------------------------
revno: 2568
revision-id: robertc at robertcollins.net-20070702051812-9ztlxv5nw1w3v10m
parent: robertc at robertcollins.net-20070702023128-5j3rtf8bx5v49tbi
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Mon 2007-07-02 15:18:12 +1000
message:
  Review feedback.
modified:
  doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
  doc/developers/status.txt      status.txt-20070702023117-6xss29lx170qndwr-1
=== modified file 'doc/developers/performance.dot'
--- a/doc/developers/performance.dot	2007-07-02 02:31:28 +0000
+++ b/doc/developers/performance.dot	2007-07-02 05:18:12 +0000
@@ -13,6 +13,7 @@
   revert_analysis[label="Work required analysis for revert"];
   revert_path_analysis[label="Work required analysis for revert of selected paths"];
   status_analysis[label="Work required analysis for status"];
+  uncommit_analysis[label="Work required analysis for uncommit"];
   wt_disk_order[label="Working Tree disk ordering\n6-8 weeks"];
 
   /* uncompleted node list - add new tasks here */
@@ -22,7 +23,6 @@
   diff_analysis[label="Work required analysis for diff"];
   diff_path_analysis[label="Work required analysis for diff of selected paths"];
   merge_analysis[label="Work required analysis for merge"];
-  uncommit_analysis[label="Work required analysis for uncommit"];
   missing_analysis[label="Work required analysis for missing"];
   update_analysis[label="Work required analysis for update"];
   cbranch_analysis[label="Work required analysis for cbranch"];

=== modified file 'doc/developers/status.txt'
--- a/doc/developers/status.txt	2007-07-02 02:31:28 +0000
+++ b/doc/developers/status.txt	2007-07-02 05:18:12 +0000
@@ -17,6 +17,9 @@
    parents recursively.
 2. Changes to the tree shape - adds/deletes/renames.
 3. Changes to versioned content - kind changes and content changes.
+4. Unknown files in the to tree.
+5. Files with conflicts in the to tree.
+
 
 Ideal work for working tree to historical status
 ------------------------------------------------
@@ -32,6 +35,15 @@
    We arguably don't care about tracking metadata for this - only the value of
    the tree the user commited.
 
+1. The entire contents of directories which are versioned when showing
+   unknowns.
+
+1. Whether a given unversioned path is unknown or ignored.
+
+1. The list conflicted paths in the tree (which match the users path
+   selection?)
+
+
 Expanding on the tree difference case we will need to:
 
 1. Stat every path in working trees which is included by the users path
@@ -43,7 +55,9 @@
    common case. There are alternative ways to achieve this - we could record
    a pointer to a revision which contained this fileid with the current content
    rather than storing the content's hash; but this seems to be a pointless 
-   double-indirection unless we save enough storage in the working tree.
+   double-indirection unless we save enough storage in the working tree. A
+   variation of this is to not record an explicit pointer but instead
+   define an implicit pointer as being to the left-hand-parent tree.
 
 
 Locality of reference