Mercurial > hg
view tests/killdaemons.py @ 16794:98687cdddcb1
merge: warn about file deleted in one branch and renamed in other (issue3074)
For divergent renames the following message is printed during merge:
note: possible conflict - file was renamed multiple times to:
newfile
file2
When a file is renamed in one branch and deleted in the other, the file still
exists after a merge. With this change a similar message is printed for mv+rm:
note: possible conflict - file was deleted and renamed to:
newfile
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 23 May 2012 20:50:16 +0200 |
parents | 13a1b2fb7ef2 |
children | eddfb9a550d0 |
line wrap: on
line source
#!/usr/bin/env python import os, time, errno, signal # Kill off any leftover daemon processes try: fp = open(os.environ['DAEMON_PIDS']) for line in fp: try: pid = int(line) except ValueError: continue try: os.kill(pid, 0) os.kill(pid, signal.SIGTERM) for i in range(10): time.sleep(0.05) os.kill(pid, 0) os.kill(pid, signal.SIGKILL) except OSError, err: if err.errno != errno.ESRCH: raise fp.close() except IOError: pass