Add rudimentary branch+merge support

1 files changed, 24 insertions, 0 deletions

diff --git a/tests.branching/init-existing.script b/tests.branching/init-existing.script
new file mode 100755
index 00000000..59b658aa
--- /dev/null
+++ b/tests.branching/init-existing.script
@@ -0,0 +1,24 @@
+#!/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.
+
+
+set -eu
+
+# Test that "morph init" works when given the name of an existing,
+# empty directory.
+
+"$SRCDIR/scripts/test-morph" init "$DATADIR/mine"
+"$SRCDIR/scripts/list-tree" "$DATADIR/mine"