=== modified file 'lib/diff.py'
--- lib/diff.py	2008-07-21 10:17:21 +0000
+++ lib/diff.py	2008-07-24 15:44:15 +0000
@@ -20,6 +20,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
+import errno
 from PyQt4 import QtCore, QtGui
 
 from bzrlib.errors import BinaryFile
@@ -148,12 +149,17 @@
                 if parent == (None, None):
                     continue
 
+                renamed = (parent[0], name[0]) != (parent[1], name[1])
+
                 dates = [None, None]
                 for ix in range(2):
                     if versioned[ix]:
-                        dates[ix] = self.trees[ix].get_file_mtime(file_id, paths[ix])
-
-                renamed = (parent[0], name[0]) != (parent[1], name[1])
+                        try:
+                            dates[ix] = self.trees[ix].get_file_mtime(file_id, paths[ix])
+                        except OSError, e:
+                            if not (renamed and e.errno == errno.ENOENT):
+                                raise
+                            dates[ix] = self.trees[ix].get_file_mtime(file_id, None)
 
                 properties_changed = [] 
                 if (executable[0] != executable[1]