From 9e18d7cc163ab95524349567fc8c4205cd0f11ce Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
Date: Mon, 26 Mar 2012 14:51:59 +0100
Subject: Add test script to test the whole branch+merge process

---
 tests.branching/workflow.script | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100755 tests.branching/workflow.script

(limited to 'tests.branching/workflow.script')

diff --git a/tests.branching/workflow.script b/tests.branching/workflow.script
new file mode 100755
index 00000000..d2ce374f
--- /dev/null
+++ b/tests.branching/workflow.script
@@ -0,0 +1,39 @@
+#!/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.
+
+
+# Do a complete workflow test with Morph branching and merging.
+
+
+set -eu
+
+
+cd "$DATADIR/mine"
+"$SRCDIR/scripts/test-morph" init
+"$SRCDIR/scripts/test-morph" branch me/readme-fix
+cd me/readme-fix/morphs
+"$SRCDIR/scripts/test-morph" edit hello master
+cd ../hello
+echo > README yoyoyo
+git add README
+git commit -m "Fix README, yo!" --quiet
+
+cd "$DATADIR/mine"
+"$SRCDIR/scripts/test-morph" checkout master
+cd master/morphs
+"$SRCDIR/scripts/test-morph" edit hello master
+"$SRCDIR/scripts/test-morph" merge me/readme-fix hello
+
-- 
cgit v1.2.1