diff options
| author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-08-29 14:46:35 +0000 |
|---|---|---|
| committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-08-29 18:49:31 +0100 |
| commit | b657fbcab062073ff4dd1c69a72b252e4992e152 (patch) | |
| tree | 6739bceee440567f10aaead17974b5eeaa7e8fb6 /tests.branching/edit-clones-chunk.script | |
| parent | ce83a0afe0a51c9b8ab75e89d23f45c3ebf2be93 (diff) | |
| download | morph-b657fbcab062073ff4dd1c69a72b252e4992e152.tar.gz | |
Add mandatory repository parameter to "morph branch"
This is complementary to adding a repository parameter to the "morph
checkout" command. It allows to branch off arbitrary repositories
rather than always branching off baserock:morphs.
All affected tests are updated to provide and work with this new
parameter.
Diffstat (limited to 'tests.branching/edit-clones-chunk.script')
| -rwxr-xr-x | tests.branching/edit-clones-chunk.script | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests.branching/edit-clones-chunk.script b/tests.branching/edit-clones-chunk.script index d5e117cb..7a3038a3 100755 --- a/tests.branching/edit-clones-chunk.script +++ b/tests.branching/edit-clones-chunk.script @@ -23,17 +23,19 @@ set -eu # Create system branch. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch newbranch +"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch # Edit chunk. -cd newbranch/morphs +cd newbranch/baserock:morphs "$SRCDIR/scripts/test-morph" edit baserock:hello master echo "Current branches, morphs:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/newbranch/morphs" branch +"$SRCDIR/scripts/run-git-in" \ + "$DATADIR/workspace/newbranch/baserock:morphs" branch echo "Current origin, morphs:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/newbranch/morphs" \ +"$SRCDIR/scripts/run-git-in" \ + "$DATADIR/workspace/newbranch/baserock:morphs" \ remote show origin | \ sed 's,\(TMP/workspace/\.morph/cache/gits/file_\).*_,\1,g' |