From 43614cfdaafb400792452285cd026a55589a8d84 Mon Sep 17 00:00:00 2001 From: Nicky Date: Mon, 17 Jan 2022 14:38:04 +0100 Subject: [PATCH] Remove obsolete scripts. --- scripts/export_for_merge.sh | 11 --------- scripts/import_to_branch.sh | 46 ------------------------------------- 2 files changed, 57 deletions(-) delete mode 100644 scripts/export_for_merge.sh delete mode 100644 scripts/import_to_branch.sh diff --git a/scripts/export_for_merge.sh b/scripts/export_for_merge.sh deleted file mode 100644 index 40cef000f6..0000000000 --- a/scripts/export_for_merge.sh +++ /dev/null @@ -1,11 +0,0 @@ -if [ -d exp/ ] -then - rm exp/*.diff -else - mkdir exp -fi - -for i in $(cat exp.txt) -do - hg export -o exp/$i.diff -r $i - done diff --git a/scripts/import_to_branch.sh b/scripts/import_to_branch.sh deleted file mode 100644 index e05e94e5fa..0000000000 --- a/scripts/import_to_branch.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -read -p "Calling hg revert and purge on indra/. Then importing changes. Continue? " ANSWER - -case "$ANSWER" in - y|Y)echo "Carrying on" - ;; - *) echo "Exit" - exit 0 - ;; -esac - -if [ ! -d indra/ ] -then - echo "Indra directory not found" - exit 1 -fi - -hg revert indra/ -hg revert autobuild.xml -hg purge indra/ - -for i in $(cat exp.txt|sort -n) -do - echo "Importing change $i" - hg import --no-commit -f exp/$i.diff || exit 1 -done - -read -p "All patches applied without errors. Apply them again and commit? " ANSWER - -case "$ANSWER" in - y|Y)echo "Carrying on" - ;; - *) echo "Exit" - exit 0 - ;; -esac - -hg revert indra/ -hg revert autobuild.xml -hg purge indra/ - -for i in $(cat exp.txt|sort -n) -do - echo "Importing change $i" - hg import exp/$i.diff || exit 1 -done