Mercurial > public > mercurial-scm > hg-stable
view tests/svn-safe-append.py @ 48472:38941a28406a
mergestate: merge `preresolve()` into `resolve()`
The separation between `preresolve()` and `resolve()` was something
added for the "merge driver" feature. Since we removed that in
32ce4cbaec4b (mergedriver: delete it, 2020-09-17), we don't need the
separation anymore. More cleanups will follow.
Differential Revision: https://phab.mercurial-scm.org/D11855
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 02 Dec 2021 22:59:36 -0800 |
parents | c102b704edb5 |
children | 6000f5b25c9b |
line wrap: on
line source
#!/usr/bin/env python3 from __future__ import absolute_import __doc__ = """Same as `echo a >> b`, but ensures a changed mtime of b. Without this svn will not detect workspace changes.""" import os import stat import sys if sys.version_info[0] >= 3: text = os.fsencode(sys.argv[1]) fname = os.fsencode(sys.argv[2]) else: text = sys.argv[1] fname = sys.argv[2] f = open(fname, "ab") try: before = os.fstat(f.fileno())[stat.ST_MTIME] f.write(text) f.write(b"\n") finally: f.close() inc = 1 now = os.stat(fname)[stat.ST_MTIME] while now == before: t = now + inc inc += 1 os.utime(fname, (t, t)) now = os.stat(fname)[stat.ST_MTIME]