# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1150130204 25200
# Node ID fb942bc15ef995655c1dd734665a607435a45a14
# Parent  be2fd6398d5018221a07cd84496b291dc32aee10# Parent  092039246d7335342e9a68be90fa625bd3780647
merge with crew.

diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -168,15 +168,17 @@ class dirstate(object):
         pos = 40
         e_size = struct.calcsize(self.format)
         while pos < len(st):
-            e = struct.unpack(self.format, st[pos:pos+e_size])
+            newpos = pos + e_size
+            e = struct.unpack(self.format, st[pos:newpos])
             l = e[4]
-            pos += e_size
-            f = st[pos:pos + l]
+            pos = newpos
+            newpos = pos + l
+            f = st[pos:newpos]
             if '\0' in f:
                 f, c = f.split('\0')
                 self.copies[f] = c
             self.map[f] = e[:4]
-            pos += l
+            pos = newpos
 
     def copy(self, source, dest):
         self.lazyread()