From 1342bf9006f28a08d1b32dc8218717ebda701dc2 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Mon, 29 Oct 2012 16:02:42 +0000 Subject: Split merge tests out from the other branching tests Merge is by far the most complex of the branching and merging commands. --- tests.merging/from-branch-not-checked-out.script | 30 ++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100755 tests.merging/from-branch-not-checked-out.script (limited to 'tests.merging/from-branch-not-checked-out.script') diff --git a/tests.merging/from-branch-not-checked-out.script b/tests.merging/from-branch-not-checked-out.script new file mode 100755 index 00000000..2ead7f0f --- /dev/null +++ b/tests.merging/from-branch-not-checked-out.script @@ -0,0 +1,30 @@ +#!/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 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 -- cgit v1.2.1