diff options
-rwxr-xr-x | tests.branching/edit-updates-stratum.script | 32 | ||||
-rw-r--r-- | tests.branching/edit-updates-stratum.stdout | 22 |
2 files changed, 54 insertions, 0 deletions
diff --git a/tests.branching/edit-updates-stratum.script b/tests.branching/edit-updates-stratum.script new file mode 100755 index 00000000..a3e213e5 --- /dev/null +++ b/tests.branching/edit-updates-stratum.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. + + +# Verify that "morph edit" clones a chunk repository into a system branch. + + +set -eu + +# Create system branch. +cd "$DATADIR/mine" +"$SRCDIR/scripts/test-morph" init +"$SRCDIR/scripts/test-morph" branch newbranch + +# Edit chunk. +cd newbranch/morphs +"$SRCDIR/scripts/test-morph" edit baserock:hello master + +git diff diff --git a/tests.branching/edit-updates-stratum.stdout b/tests.branching/edit-updates-stratum.stdout new file mode 100644 index 00000000..7dd3a8e2 --- /dev/null +++ b/tests.branching/edit-updates-stratum.stdout @@ -0,0 +1,22 @@ +diff --git a/hello-stratum.morph b/hello-stratum.morph +index d7c0afe..af63df7 100644 +--- a/hello-stratum.morph ++++ b/hello-stratum.morph +@@ -1,10 +1,13 @@ + { +- "name": "hello-stratum", +- "kind": "stratum", ++ "build-system": "manual", ++ "kind": "stratum", ++ "name": "hello-stratum", + "sources": [ + { +- "name": "hello", +- "ref": "master", ++ "build-depends": null, ++ "morph": "hello", ++ "name": "hello", ++ "ref": "newbranch", + "repo": "baserock:hello" + } + ] |