diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-05-17 22:45:41 +0300 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-05-17 22:45:41 +0300 |
commit | ac7e1908daa969e7fcd16ad9e5a80b34b92417ad (patch) | |
tree | 5a2b32f489b6c2ec55665aa7d25d677328bcee8e /tests.branching | |
parent | 8dc8e8f153032461af95b73617617954cd6d600d (diff) | |
download | morph-ac7e1908daa969e7fcd16ad9e5a80b34b92417ad.tar.gz |
Allow "morph edit" to have a default ref to branch off from
Diffstat (limited to 'tests.branching')
-rwxr-xr-x | tests.branching/edit-uses-ref-from-stratum.script | 33 | ||||
-rw-r--r-- | tests.branching/edit-uses-ref-from-stratum.stdout | 2 |
2 files changed, 35 insertions, 0 deletions
diff --git a/tests.branching/edit-uses-ref-from-stratum.script b/tests.branching/edit-uses-ref-from-stratum.script new file mode 100755 index 00000000..74c26d5a --- /dev/null +++ b/tests.branching/edit-uses-ref-from-stratum.script @@ -0,0 +1,33 @@ +#!/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 + +cd ../hello +git branch diff --git a/tests.branching/edit-uses-ref-from-stratum.stdout b/tests.branching/edit-uses-ref-from-stratum.stdout new file mode 100644 index 00000000..d14c4c96 --- /dev/null +++ b/tests.branching/edit-uses-ref-from-stratum.stdout @@ -0,0 +1,2 @@ + master +* newbranch |