From 4496af4a5c37cd4a1bc78dabe81a2c69158e7642 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Mon, 6 Mar 2023 10:30:33 -0600 Subject: [PATCH] check-versions: remove hg hack It was only needed for hg-git tests. Signed-off-by: Felipe Contreras --- tools/check-versions | 4 ---- tools/hg_revert_5.7.patch | 24 ------------------------ 2 files changed, 28 deletions(-) delete mode 100644 tools/hg_revert_5.7.patch diff --git a/tools/check-versions b/tools/check-versions index b57fa54..06d4e4c 100755 --- a/tools/check-versions +++ b/tools/check-versions @@ -203,10 +203,6 @@ def add_component(id, url, **args) end hg_checkout_fix = lambda do |version| - if check_version(version, '5.7') - run_cmd %W[hg import -q --no-commit #{__dir__}/hg_revert_5.7.patch] - end - FileUtils.cp('hg', "#{$builddir}/bin/") return if check_version(version, '4.3') diff --git a/tools/hg_revert_5.7.patch b/tools/hg_revert_5.7.patch deleted file mode 100644 index 71dd115..0000000 --- a/tools/hg_revert_5.7.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/hg b/hg -index 4ec2b6140b..a3e61ad39c 100755 ---- a/hg -+++ b/hg -@@ -1,4 +1,4 @@ --#!/usr/bin/env python3 -+#!/usr/bin/env python - # - # mercurial - scalable distributed SCM - # -diff --git a/mercurial/hg.py b/mercurial/hg.py -index 1a7a281e30..bf75f15ac1 100644 ---- a/mercurial/hg.py -+++ b/mercurial/hg.py -@@ -1013,7 +1013,7 @@ def clone( - pass - if uprev is None: - try: -- if destrepo._activebookmark: -+ if False: - uprev = destrepo.lookup(destrepo._activebookmark) - update = destrepo._activebookmark - else: -