summaryrefslogtreecommitdiff
path: root/tests.merging/move-chunk-repo.script
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-06-18 17:12:10 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2014-07-07 12:30:16 +0000
commit956f5204ec7f69db8a276a4e10313fd282a235a6 (patch)
tree226f1b0a39e73f9b2e31a68a2b76c361593cb721 /tests.merging/move-chunk-repo.script
parentd2a58462e6b2ffab0d636b1575c46a58099a82b7 (diff)
downloadmorph-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/move-chunk-repo.script')
-rwxr-xr-xtests.merging/move-chunk-repo.script55
1 files changed, 0 insertions, 55 deletions
diff --git a/tests.merging/move-chunk-repo.script b/tests.merging/move-chunk-repo.script
deleted file mode 100755
index 405e6c88..00000000
--- a/tests.merging/move-chunk-repo.script
+++ /dev/null
@@ -1,55 +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 detect changes in a repo that was added as part of the
-## branch and warn the user that the changes will not be merged automatically
-
-set -eu
-
-# Create system branch.
-cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch test:morphs baserock/newbranch
-
-"$SRCDIR/scripts/test-morph" edit hello
-
-# Chunk moves to a new location (we manually update the ref back to master
-# here, so 'morph edit' can create a system branch in the new repo from it).
-git clone -q "$DATADIR/hello" "$DATADIR/hello-lorried"
-cd "$DATADIR/workspace/baserock/newbranch/test:morphs"
-sed -e 's/"repo": "test:hello"/"repo": "test:hello-lorried"/' \
- -e 's/"ref": "baserock\/newbranch"/"ref": "master"/' \
- -i hello-stratum.morph
-git commit -q --all -m "'hello' repository has moved"
-
-# Now we further edit the chunk, just for fun.
-"$SRCDIR/scripts/test-morph" edit hello
-cd "$DATADIR/workspace/baserock/newbranch/test:hello-lorried"
-touch newfile.txt
-git add newfile.txt
-git commit -m "Add new file" --quiet
-
-cd "$DATADIR/workspace/baserock/newbranch/test:morphs"
-git commit -q --all -m "Update system branch refs"
-
-# Try to merge changes back to master (should fail, because we don't support
-# adding chunks inside branches yet).
-cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" checkout test:morphs master
-cd master
-"$SRCDIR/scripts/test-morph" merge baserock/newbranch