diff options
Diffstat (limited to 'tests.branching/merge-error-cases.script')
-rwxr-xr-x | tests.branching/merge-error-cases.script | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/tests.branching/merge-error-cases.script b/tests.branching/merge-error-cases.script deleted file mode 100755 index e802f139..00000000 --- a/tests.branching/merge-error-cases.script +++ /dev/null @@ -1,30 +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. - -# Check "morph merge" gives reasonable error messages - -set -eu - -# Create system branch. -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init - -"$SRCDIR/scripts/test-morph" checkout baserock: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 |