Mercurial > hg
view tests/svn-safe-append.py @ 26939:50d2389a2e49
resolve: choose where .orig file locations are kept
Having your working copy littered with .orig files is a common HG complaint.
This patch uses the cmd.origpath helper function to let the user
specify where they should be kept when using the resolve command.
author | Christian Delahousse <cdelahousse@fb.com> |
---|---|
date | Tue, 10 Nov 2015 14:26:19 -0800 |
parents | c1b47c0fd2b6 |
children | bdba6a2015d0 |
line wrap: on
line source
#!/usr/bin/env python __doc__ = """Same as `echo a >> b`, but ensures a changed mtime of b. Without this svn will not detect workspace changes.""" import sys, os text = sys.argv[1] fname = sys.argv[2] f = open(fname, "ab") try: before = os.fstat(f.fileno()).st_mtime f.write(text) f.write("\n") finally: f.close() inc = 1 now = os.stat(fname).st_mtime while now == before: t = now + inc inc += 1 os.utime(fname, (t, t)) now = os.stat(fname).st_mtime