6 files changed, 0 insertions, 145 deletions
diff --git a/tests.branching/tag-fails-if-tag-exists.exit b/tests.branching/tag-fails-if-tag-exists.exit
deleted file mode 100644
index d00491fd..00000000
--- a/tests.branching/tag-fails-if-tag-exists.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests.branching/tag-fails-if-tag-exists.script b/tests.branching/tag-fails-if-tag-exists.script
deleted file mode 100755
index e1d1cc0d..00000000
--- a/tests.branching/tag-fails-if-tag-exists.script
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2012-2013  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.
-
-
-## Check that 'morph tag example-tag' fails if 'example-tag' already exists.
-
-set -eu
-
-# Make sure the commits always have the same SHA1s.
-. "$SRCDIR/scripts/fix-committer-info"
-
-# Create a workspace and branch.
-cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" checkout test:morphs master
-
-# Tag the system branch twice.
-"$SRCDIR/scripts/test-morph" tag example-tag -- -m First
-"$SRCDIR/scripts/test-morph" tag example-tag -- -m Second
diff --git a/tests.branching/tag-fails-if-tag-exists.stderr b/tests.branching/tag-fails-if-tag-exists.stderr
deleted file mode 100644
index b774dfba..00000000
--- a/tests.branching/tag-fails-if-tag-exists.stderr
+++ /dev/null
@@ -1 +0,0 @@
-ERROR: test:morphs: Tag "example-tag" already exists
diff --git a/tests.branching/workflow-separate-stratum-repos.script b/tests.branching/workflow-separate-stratum-repos.script
deleted file mode 100755
index 1d8cc1e5..00000000
--- a/tests.branching/workflow-separate-stratum-repos.script
+++ /dev/null
@@ -1,72 +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.
-
-
-## Do a complete workflow test, with strata outside the main morphologies
-## repository.
-
-# FIXME: We don't know if we want to support this, and the new "morph
-# edit" doesn't support it yet, also due to time constraints.
-exit 0
-
-set -eu
-
-. "$SRCDIR/scripts/setup-3rd-party-strata"
-
-# Make a change to the system
-# FIXME: we should try and build it, too
-cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" branch test:morphs me/readme-fixes
-
-# Edit one chunk
-cd "me/readme-fixes"
-"$SRCDIR/scripts/test-morph" edit hello
-cd "$DATADIR/workspace/me/readme-fixes/test/stratum2-hello"
-echo > README yoyoyo
-git add README
-git commit -m "Fix README in hello" --quiet
-
-# Edit the other chunk too
-"$SRCDIR/scripts/test-morph" edit hello
-cd "$DATADIR/workspace/me/readme-fixes/test/stratum3-hello"
-echo > README yoyoyo
-git add README
-git commit -m "Fix README in hello" --quiet
-
-# Update the morphology repos
-cd ../test/external-strata
-git commit --quiet --all -m "Commit changes for system branch"
-
-cd ../test/morphs
-git commit --quiet --all -m "Commit changes for system branch"
-
-# Merge our system branch into master
-cd "$DATADIR/workspace"
-cd master
-"$SRCDIR/scripts/test-morph" merge me/readme-fixes
-
-# Check the changes have appeared
-cd test/morphs
-[ $(git rev-parse HEAD) = $(git rev-parse master) ]
-
-cd ../test/stratum2-hello
-[ -e README ]
-[ $(git rev-parse HEAD) = $(git rev-parse master) ]
-
-cd ../test/stratum3-hello
-[ -e README ]
-[ $(git rev-parse HEAD) = $(git rev-parse master) ]
diff --git a/tests.branching/workflow.script b/tests.branching/workflow.script
deleted file mode 100755
index f84489db..00000000
--- a/tests.branching/workflow.script
+++ /dev/null
@@ -1,38 +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.
-
-
-## Do a complete workflow test with Morph branching and merging.
-
-set -eu
-
-cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch test:morphs me/readme-fix
-"$SRCDIR/scripts/test-morph" edit hello
-cd me/readme-fix/test/hello
-echo > README yoyoyo
-git add README
-git commit -m "Fix README, yo!" --quiet
-
-cd ../morphs
-git commit --quiet --all -m "Commit changes for system branch"
-
-cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" checkout test:morphs master
-cd master
-"$SRCDIR/scripts/test-morph" merge me/readme-fix
diff --git a/tests.branching/workflow.stdout b/tests.branching/workflow.stdout
deleted file mode 100644
index e69de29b..00000000
--- a/tests.branching/workflow.stdout
+++ /dev/null