chiark / gitweb /
Change the file timestamp in 'resolved --reset' (bug #10017)
authorCatalin Marinas <catalin.marinas@gmail.com>
Fri, 7 Dec 2007 21:19:24 +0000 (21:19 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Fri, 7 Dec 2007 21:19:24 +0000 (21:19 +0000)
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
stgit/commands/common.py

index 78a364fdee8d4831d4b039f034de5d41246148ee..384038753ceb727fd3eeb417e46a4f992afbc83b 100644 (file)
@@ -152,6 +152,8 @@ def resolved(filename, reset = None):
             if os.path.isfile(filename):
                 os.remove(filename)
             os.rename(reset_file, filename)
+            # update the access and modificatied times
+            os.utime(filename, None)
 
     git.update_cache([filename], force = True)