# HG changeset patch
# User mpm@selenic.com
# Date 1117926851 28800
# Node ID 3fd8fc14b12f87abc2f04ee6fcd46b8073d46eca
# Parent  45ee7c4cae4fdf54ba44cc8249e6d16880dbf09b
backup dirstate for undo

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

backup dirstate for undo

manifest hash: 2999407c1f8999e91ba0e23828cb406803b364a5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCojXDywK+sNU5EO8RAotIAKC3P3Oz+9n/EgqkFc0UMTlUErSNAQCgpjYm
hpuZlC4lNO6aRiDfPVDL8Cw=
=DDtT
-----END PGP SIGNATURE-----


diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -354,6 +354,9 @@ class localrepository:
         return filelog(self.opener, f)
 
     def transaction(self):
+        # save dirstate for undo
+        ds = self.opener("dirstate").read()
+        self.opener("undo.dirstate", "w").write(ds)
         return transaction(self.opener, self.join("journal"),
                            self.join("undo"))
 
@@ -368,19 +371,11 @@ class localrepository:
     def undo(self):
         lock = self.lock()
         if os.path.exists(self.join("undo")):
-            f = self.changelog.read(self.changelog.tip())[3]
             self.ui.status("attempting to rollback last transaction\n")
             rollback(self.opener, self.join("undo"))
-            self.manifest = manifest(self.opener)
-            self.changelog = changelog(self.opener)
-
-            self.ui.status("discarding dirstate\n")
-            node = self.changelog.tip()
-            f.sort()
-
-            self.dirstate.setparents(node)
-            self.dirstate.update(f, 'i')
-        
+            self.dirstate = None
+            os.rename(self.join("undo.dirstate"), self.join("dirstate"))
+            self.dirstate = dirstate(self.opener, self.ui, self.root)
         else:
             self.ui.warn("no undo information available\n")