diff mercurial/dirstate.py @ 13343:69e69b131458

merge with stable
author Martin Geisler <mg@lazybytes.net>
date Fri, 04 Feb 2011 09:17:07 +0100
parents 0935ff767285 22167be007ed
children 14f3795a5ed7
line wrap: on
line diff
--- a/mercurial/dirstate.py	Wed Feb 02 13:51:22 2011 +0100
+++ b/mercurial/dirstate.py	Fri Feb 04 09:17:07 2011 +0100
@@ -508,7 +508,7 @@
             if files[i] < subpath:
                 i += 1
                 continue
-            while files and files[i].startswith(subpath):
+            while i < len(files) and files[i].startswith(subpath):
                 del files[i]
             j += 1