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/from-branch-not-checked-out.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/from-branch-not-checked-out.script')
| -rwxr-xr-x | tests.merging/from-branch-not-checked-out.script | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/tests.merging/from-branch-not-checked-out.script b/tests.merging/from-branch-not-checked-out.script deleted file mode 100755 index e51af791..00000000 --- a/tests.merging/from-branch-not-checked-out.script +++ /dev/null @@ -1,32 +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. - - -## Handle 'from' branch not being checked out - -set -eu - -# Create system branch. -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init - -"$SRCDIR/scripts/test-morph" checkout test:morphs master -cd master - -# 'From' branch is not checked out (and also doesn't exist, but that -# problem can only be detected when 'morph checkout' is run) -"$SRCDIR/scripts/test-morph" merge baserock/newbranch || true |