You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/08/23 14:17:03 UTC

svn commit: r988100 - /subversion/trunk/notes/external-vs-switched

Author: julianfoad
Date: Mon Aug 23 12:17:03 2010
New Revision: 988100

URL: http://svn.apache.org/viewvc?rev=988100&view=rev
Log:
* notes/external-vs-switched
  (table of differences): Split the table into two.  Don't mention
    'switch' operating on a WC root, as hardly relevant here.
    Mention 'merge' differences.

Modified:
    subversion/trunk/notes/external-vs-switched

Modified: subversion/trunk/notes/external-vs-switched
URL: http://svn.apache.org/viewvc/subversion/trunk/notes/external-vs-switched?rev=988100&r1=988099&r2=988100&view=diff
==============================================================================
--- subversion/trunk/notes/external-vs-switched (original)
+++ subversion/trunk/notes/external-vs-switched Mon Aug 23 12:17:03 2010
@@ -98,9 +98,21 @@ current (1.6.x) behaviour.
   |                      |                      |                      |
   | update               | ?                    | ?                    |
   |                      |                      |                      |
-  | switch               | Can switch a WC root | No UI exists for an  |
-  |                      |   but it's not then  |   external outside   |
-  |                      |   recorded as such.  |   of a WC.           |
+  | switch               | ?                    | ?                    |
+  |                      |                      |                      |
+  | merge (tracking)     | Skip it; track it as | Just skip it; no     |
+  |                      | skipped.             | tracking needed.     |
+  |                      |                      |                      |
+  | ...                  |                      |                      |
+  |                      |                      |                      |
+  +----------------------+----------------------+----------------------+
+
+Behaviour differences when the target is the switched/external node or
+somewhere inside it:
+
+  +----------------------+----------------------+----------------------+
+  |                      | switched             | external             |
+  +----------------------+----------------------+----------------------+
   |                      |                      |                      |
   | ...                  |                      |                      |
   |                      |                      |                      |