--- a/mercurial/localrepo.py	Fri Apr 11 17:20:15 2014 -0400
+++ b/mercurial/localrepo.py	Sun Mar 09 01:03:28 2014 +0900
@@ -862,7 +862,7 @@
                 (self.svfs, 'journal.phaseroots'))
 
     def undofiles(self):
-        return [vfs.join(undoname(x)) for vfs, x in self._journalfiles()]
+        return [(vfs, undoname(x)) for vfs, x in self._journalfiles()]
 
     def _writejournal(self, desc):
         self.opener.write("journal.dirstate",