Submitter | Gregory Szorc |
---|---|
Date | Aug. 3, 2019, 7:14 p.m. |
Message ID | <fcf8e489d6a667bfd2fc.1564859660@ubuntu-vm-main> |
Download | mbox | patch |
Permalink | /patch/41139/ |
State | Accepted |
Headers | show |
Comments
On Sat, 03 Aug 2019 12:14:20 -0700, Gregory Szorc wrote: > # HG changeset patch > # User Gregory Szorc <gregory.szorc@gmail.com> > # Date 1564859631 25200 > # Sat Aug 03 12:13:51 2019 -0700 > # Branch stable > # Node ID fcf8e489d6a667bfd2fcf066b545e52519309ee1 > # Parent e0cf09bc35ef6d7e8554e5be98441e995c856759 > automation: push changes affecting .hgtags Queued for stable, thanks.
Patch
diff --git a/contrib/automation/hgautomation/linux.py b/contrib/automation/hgautomation/linux.py --- a/contrib/automation/hgautomation/linux.py +++ b/contrib/automation/hgautomation/linux.py @@ -485,7 +485,9 @@ def synchronize_hg(source_path: pathlib. 'python2.7', str(hg_bin), '--config', 'ui.ssh=ssh -F %s' % ssh_config, '--config', 'ui.remotecmd=/hgdev/venv-bootstrap/bin/hg', - 'push', '-f', '-r', full_revision, + # Also ensure .hgtags changes are present so auto version + # calculation works. + 'push', '-f', '-r', full_revision, '-r', 'file(.hgtags)', 'ssh://%s//hgwork/src' % public_ip, ] 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,9 @@ 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', '-f', '-r', full_revision, + # Also ensure .hgtags changes are present so auto version + # calculation works. + 'push', '-f', '-r', full_revision, '-r', 'file(.hgtags)', 'ssh://%s/c:/hgdev/src' % public_ip, ]