# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1131752057 28800
# Node ID 27077812fffb76115e0034f2003155e375d92640
# Parent  2ba8bf7defda2a547678a195b7a1c3a2e9be7ac4
reset mtime when two files are equal



diff -r 2ba8bf7defda -r 27077812fffb mercurial/localrepo.py
--- a/mercurial/localrepo.py	Fri Nov 11 15:34:13 2005 -0800
+++ b/mercurial/localrepo.py	Fri Nov 11 15:34:17 2005 -0800
@@ -486,6 +486,10 @@
 
         # are we comparing the working directory?
         if not node2:
+            try:
+                wlock = self.wlock(wait=0)
+            except lock.LockHeld:
+                wlock = None
             l, c, a, d, u = self.dirstate.changes(files, match)
 
             # are we comparing working dir against its parent?
@@ -497,6 +501,8 @@
                     for f in l:
                         if fcmp(f, mf2):
                             c.append(f)
+                        elif wlock is not None:
+                            self.dirstate.update([f], "n")
 
                 for l in c, a, d, u:
                     l.sort()