Add test for petrify warning

2 files changed, 33 insertions, 0 deletions

diff --git a/tests.branching/merge-warns-if-petrifying-local.script b/tests.branching/merge-warns-if-petrifying-local.script
new file mode 100755
index 00000000..12e726ed
--- /dev/null
+++ b/tests.branching/merge-warns-if-petrifying-local.script
@@ -0,0 +1,32 @@
+#!/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
diff --git a/tests.branching/merge-warns-if-petrifying-local.stdout b/tests.branching/merge-warns-if-petrifying-local.stdout
new file mode 100644
index 00000000..65985486
--- /dev/null
+++ b/tests.branching/merge-warns-if-petrifying-local.stdout
@@ -0,0 +1 @@
+WARNING: chunk "hello-system.hello-stratum.hello" is now petrified