Author: stsp
Date: Tue Sep 7 15:10:11 2010
New Revision: 993390
URL: http://svn.apache.org/viewvc?rev=993390&view=rev
Log:
* tools/dev/wc-ng/bump-to-19.py
(move_and_shard_pristine_files): If a shard already exists, don't
attempt to rename it into itself. Saw this error on a working copy
which had its subdirectories at various formats, so bump-to-19.py
errored out early. On subsequent runs, however, it kept trying to rename
.svn/pristine/00 to .svn/pristine/00/00 within already converted
directories, not realising the pristine directory had already been sharded.
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=993390&r1=993389&r2=993390&view=diff
==============================================================================
--- subversion/trunk/tools/dev/wc-ng/bump-to-19.py (original)
+++ subversion/trunk/tools/dev/wc-ng/bump-to-19.py Tue Sep 7 15:10:11 2010
@@ -192,6 +192,8 @@ def move_and_shard_pristine_files(old_wc
for basename in os.listdir(old_pristine_dir):
shard = basename[:2]
+ if shard == basename: # already converted
+ continue
old = os.path.join(old_pristine_dir, basename)
new = os.path.join(new_pristine_dir, shard, basename)
os.renames(old, new)
