From 956f5204ec7f69db8a276a4e10313fd282a235a6 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Wed, 18 Jun 2014 17:12:10 +0000 Subject: Exorcise some old and unused commands `morph merge` only worked for a small subset of cases, and has been left to bit-rot, since we don't use it. `morph tag` is just a `git tag` when we have petrified definitions repository. We don't use it, nor do we need it, so it can go away rather than take up valuable development time fixing it when requirements change. `old-foo` have all been superceded by newer versions and are no-longer used. --- .../warn-if-merging-petrified-morphologies.script | 34 ---------------------- 1 file changed, 34 deletions(-) delete mode 100755 tests.merging/warn-if-merging-petrified-morphologies.script (limited to 'tests.merging/warn-if-merging-petrified-morphologies.script') diff --git a/tests.merging/warn-if-merging-petrified-morphologies.script b/tests.merging/warn-if-merging-petrified-morphologies.script deleted file mode 100755 index 5753786c..00000000 --- a/tests.merging/warn-if-merging-petrified-morphologies.script +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2012 Codethink Limited -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -## If the user merges a petrified branch into an unpetrified branch, -## we should warn them. - -set -eu - -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" checkout test:morphs master -"$SRCDIR/scripts/test-morph" branch test:morphs test/petrified - -cd "$DATADIR/workspace/test/petrified/test:morphs" -"$SRCDIR/scripts/test-morph" petrify -git commit --quiet --all -m "Petrify branch" - -cd "$DATADIR/workspace/master/test:morphs" -"$SRCDIR/scripts/test-morph" merge test/petrified -- cgit v1.2.1