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/workflow.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/workflow.script')
| -rwxr-xr-x | tests.branching/workflow.script | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests.branching/workflow.script b/tests.branching/workflow.script index 59c7b152..c8ee2187 100755 --- a/tests.branching/workflow.script +++ b/tests.branching/workflow.script @@ -23,17 +23,16 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch me/readme-fix -cd me/readme-fix/morphs +"$SRCDIR/scripts/test-morph" branch baserock:morphs me/readme-fix "$SRCDIR/scripts/test-morph" edit baserock:hello master -cd ../baserock:hello +cd me/readme-fix/baserock:hello echo > README yoyoyo git add README git commit -m "Fix README, yo!" --quiet cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" checkout baserock:morphs master -cd master/baserock:morphs +cd master "$SRCDIR/scripts/test-morph" edit baserock:hello master "$SRCDIR/scripts/test-morph" merge me/readme-fix baserock:hello |