chiark
/
gitweb
/
~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Change the file timestamp in 'resolved --reset' (bug #10017)
[stgit]
/
stgit
/
commands
/
common.py
diff --git
a/stgit/commands/common.py
b/stgit/commands/common.py
index 78a364fdee8d4831d4b039f034de5d41246148ee..384038753ceb727fd3eeb417e46a4f992afbc83b 100644
(file)
--- a/
stgit/commands/common.py
+++ b/
stgit/commands/common.py
@@
-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)