changeset 42282:5c242c427897

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
author Gregory Szorc <gregory.szorc@gmail.com>
date Fri, 19 Apr 2019 08:32:24 -0700
parents 4274b1369b75
children d137a3d5ad41
files contrib/automation/hgautomation/windows.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/automation/hgautomation/windows.py	Fri Apr 19 08:21:02 2019 -0700
+++ b/contrib/automation/hgautomation/windows.py	Fri Apr 19 08:32:24 2019 -0700
@@ -176,7 +176,8 @@
             '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)