Author: julianfoad
Date: Wed Sep  1 12:11:44 2010
New Revision: 991509

URL: http://svn.apache.org/viewvc?rev=991509&view=rev
Log:
* tools/dev/wc-ng/bump-to-19.py
  Remove a TODO about skipping other-WC dirs.
  Add a TODO about deleting to-be-deleted directories.

Modified:
    subversion/trunk/tools/dev/wc-ng/bump-to-19.py

Modified: subversion/trunk/tools/dev/wc-ng/bump-to-19.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/wc-ng/bump-to-19.py?rev=991509&r1=991508&r2=991509&view=diff
==============================================================================
--- subversion/trunk/tools/dev/wc-ng/bump-to-19.py (original)
+++ subversion/trunk/tools/dev/wc-ng/bump-to-19.py Wed Sep  1 12:11:44 2010
@@ -6,21 +6,18 @@
    Usage: bump-to-19.py WC_ROOT_DIR
    where WC_ROOT_DIR is the path to the WC root directory.
 
-   Skips non-WC dirs and WC dirs that are not at format 18.
-
-   WARNING: Currently it merges ALL sub-dir WC dirs into the root, including
-   'external' WCs and unrelated WCs, which will break those."""
-
-# TODO: Don't walk into unrelated subdir WCs or 'external' WCs.
-#
-#   Bert says: To find the children of a directory in a more robust way you
-#   need to parse the presence+kind in the parent dir for both BASE and
-#   WORKING. Excluded and not present are the most interesting statee in the
-#   parent. Handling keep-local and deleting the dirs on the upgrade + all
-#   the obstruction cases will make the final code much harder.
+   Skips non-WC dirs and WC dirs that are not at format 18."""
 
 # TODO: Detect '_svn' as an alternative to '.svn'.
 
+# TODO: Probably should remove any directory that is in state to-be-deleted
+#       and doesn't have its 'keep_local' flag set.  Otherwise it will
+#       become unversioned after commit, whereas format-18 and earlier would
+#       have deleted it after commit.  Before deleting we should check there
+#       are no unversioned things inside, and maybe even check for "local
+#       mods" even though that's logically impossible.  On the other hand
+#       it's not a big deal for the user to clean these up manually.
+
 
 import sys, os, shutil, sqlite3
 


Reply via email to