Mercurial > hg
view tests/svn-safe-append.py @ 38667:572dff5c946e
rebase: add --confirm option
This feature adds a functionality in rebase to confirm before applying
changes.
When there is no conflict and user confirm to apply actions, we just
finish the unfinished rebase. But when there is a conflict and user
confirm to apply actions then we can't just finish rebasing using
rbsrt._finishrebase() because in-memory merge doesn't support conflicts, so
we have to abort and run on-disk merge in this case.
And if user doesn't confirm to apply actions then simply abort the rebase.
Differential Revision: https://phab.mercurial-scm.org/D3870
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Sat, 30 Jun 2018 12:42:49 +0530 |
parents | ffa3026d4196 |
children | e1e10cbb5568 |
line wrap: on
line source
#!/usr/bin/env python 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 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("\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]