# HG changeset patch # User Gregory Szorc # Date 2019-04-19 15:32:24 # Node ID 5c242c4278974ba5ff34e3a097ededd6ffd715bb # Parent 4274b1369b757218fc146f5e737ea07c75bed131 automation: do a force push to synchronize We don't know what the state of the remote is. Force pushing will be more resilient. Differential Revision: https://phab.mercurial-scm.org/D6316 diff --git a/contrib/automation/hgautomation/windows.py b/contrib/automation/hgautomation/windows.py --- a/contrib/automation/hgautomation/windows.py +++ b/contrib/automation/hgautomation/windows.py @@ -176,7 +176,8 @@ def synchronize_hg(hg_repo: pathlib.Path 'python2.7', hg_bin, '--config', 'ui.ssh=ssh -F %s' % ssh_config, '--config', 'ui.remotecmd=c:/hgdev/venv-bootstrap/Scripts/hg.exe', - 'push', '-r', full_revision, 'ssh://%s/c:/hgdev/src' % public_ip, + 'push', '-f', '-r', full_revision, + 'ssh://%s/c:/hgdev/src' % public_ip, ] subprocess.run(args, cwd=str(hg_repo), env=env, check=True)