Mercurial > hg
view tests/svn-safe-append.py @ 39575:aa022f8873ea
rebase: add tests showing patch conflict detection needs to be smarter in IMM
This patch adds test which shows that you can't rebase a cset which removes a
dir and adds a file of the same as that of dir as there are False positives
path conflicts reported.
I fixed the case when there is a file and we adds a dir of same name while
removing the file, but missed testing the current case. Next patch will fix
this.
Differential Revision: https://phab.mercurial-scm.org/D4544
author | Pulkit Goyal <pulkit@yandex-team.ru> |
---|---|
date | Wed, 12 Sep 2018 17:22:46 +0300 |
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]