diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-06-18 17:12:10 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-07-07 12:30:16 +0000 |
| commit | 956f5204ec7f69db8a276a4e10313fd282a235a6 (patch) | |
| tree | 226f1b0a39e73f9b2e31a68a2b76c361593cb721 /tests.merging/rename-stratum.script | |
| parent | d2a58462e6b2ffab0d636b1575c46a58099a82b7 (diff) | |
| download | morph-956f5204ec7f69db8a276a4e10313fd282a235a6.tar.gz | |
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.
Diffstat (limited to 'tests.merging/rename-stratum.script')
| -rwxr-xr-x | tests.merging/rename-stratum.script | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/tests.merging/rename-stratum.script b/tests.merging/rename-stratum.script deleted file mode 100755 index 11c4cb50..00000000 --- a/tests.merging/rename-stratum.script +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2012-2014 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. - - -## "morph merge" should deal with stratum renames; currently it doesn't deal -## very well, but at least we don't crash. - -set -eu - -# Create system branch. -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch test:morphs baserock/newbranch - -# Rename the stratum -cd baserock/newbranch/test:morphs -sed -e 's/"morph": "hello-stratum"/"morph": "goodbye-stratum"/'\ - -i hello-system.morph -sed -e 's/"name": "hello-stratum"/"name": "goodbye-stratum"/' \ - hello-stratum.morph > goodbye-stratum.morph -git rm -q hello-stratum.morph -git add goodbye-stratum.morph -git commit -q --all -m "Rename hello-stratum to goodbye-stratum" - -# Merge changes back to master (this should fail, because we don't support -# adding strata inside branches yet). -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" checkout test:morphs master -cd master -"$SRCDIR/scripts/test-morph" merge baserock/newbranch |