diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-29 16:02:42 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-29 18:19:26 +0000 |
commit | 1342bf9006f28a08d1b32dc8218717ebda701dc2 (patch) | |
tree | 0872d902b6ad4af6c4e238a28bc0c01624c62e0b /tests.branching/merge-warns-if-merging-petrified-morphologies.script | |
parent | 9e4159ba97862c78a9cfa3e3816f18c708ccba5e (diff) | |
download | morph-1342bf9006f28a08d1b32dc8218717ebda701dc2.tar.gz |
Split merge tests out from the other branching tests
Merge is by far the most complex of the branching and merging commands.
Diffstat (limited to 'tests.branching/merge-warns-if-merging-petrified-morphologies.script')
-rwxr-xr-x | tests.branching/merge-warns-if-merging-petrified-morphologies.script | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/tests.branching/merge-warns-if-merging-petrified-morphologies.script b/tests.branching/merge-warns-if-merging-petrified-morphologies.script deleted file mode 100755 index 12e726ed..00000000 --- a/tests.branching/merge-warns-if-merging-petrified-morphologies.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. - -# If the user merges a petrified branch into an unpetrified branch, -# we should warn them. - -set -eu - -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master -"$SRCDIR/scripts/test-morph" branch baserock:morphs test/petrified - -cd "$DATADIR/workspace/test/petrified/baserock:morphs" -"$SRCDIR/scripts/test-morph" petrify -git commit --quiet --all -m "Petrify branch" - -cd "$DATADIR/workspace/master/baserock:morphs" -"$SRCDIR/scripts/test-morph" merge test/petrified |