merge.graft: add option to keep second parent
Currently merge.graft re-writes the dirstate so only a single
parent is kept. For some cases, like evolving a merge commit,
this behaviour is not desired. More specifically, this is
needed to fix issue4389.
#!/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