diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-03-10 11:31:45 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-03-10 11:31:45 +0000 |
commit | 444ba7c2f0f3d53753abeff6dfd33681279a3d84 (patch) | |
tree | afdd012aa6d6001731e91dd863c9dbc45919d767 /tests.branching/workflow-separate-stratum-repos.script | |
parent | 356e5f60268b154a5aa09b4fbcd716d908262b56 (diff) | |
parent | 2c4752d71d35ec31221dcdab1289d2084936ccae (diff) | |
download | morph-444ba7c2f0f3d53753abeff6dfd33681279a3d84.tar.gz |
Merge branch 'liw/fix-check-2-rebase'
Reviewed-by: Daniel Silverstone
Reviewed-by: Richard Maw
Diffstat (limited to 'tests.branching/workflow-separate-stratum-repos.script')
-rwxr-xr-x | tests.branching/workflow-separate-stratum-repos.script | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests.branching/workflow-separate-stratum-repos.script b/tests.branching/workflow-separate-stratum-repos.script index 3faf23f5..f2fd519b 100755 --- a/tests.branching/workflow-separate-stratum-repos.script +++ b/tests.branching/workflow-separate-stratum-repos.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012-2013 Codethink Limited +# Copyright (C) 2012-2014 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 @@ -35,23 +35,23 @@ cd "$DATADIR/workspace" # Edit one chunk cd "me/readme-fixes" "$SRCDIR/scripts/test-morph" edit hello-system stratum2 hello -cd "$DATADIR/workspace/me/readme-fixes/test:stratum2-hello" +cd "$DATADIR/workspace/me/readme-fixes/test/stratum2-hello" echo > README yoyoyo git add README git commit -m "Fix README in hello" --quiet # Edit the other chunk too "$SRCDIR/scripts/test-morph" edit hello-system stratum3 hello -cd "$DATADIR/workspace/me/readme-fixes/test:stratum3-hello" +cd "$DATADIR/workspace/me/readme-fixes/test/stratum3-hello" echo > README yoyoyo git add README git commit -m "Fix README in hello" --quiet # Update the morphology repos -cd ../test:external-strata +cd ../test/external-strata git commit --quiet --all -m "Commit changes for system branch" -cd ../test:morphs +cd ../test/morphs git commit --quiet --all -m "Commit changes for system branch" # Merge our system branch into master @@ -60,13 +60,13 @@ cd master "$SRCDIR/scripts/test-morph" merge me/readme-fixes # Check the changes have appeared -cd test:morphs +cd test/morphs [ $(git rev-parse HEAD) = $(git rev-parse master) ] -cd ../test:stratum2-hello +cd ../test/stratum2-hello [ -e README ] [ $(git rev-parse HEAD) = $(git rev-parse master) ] -cd ../test:stratum3-hello +cd ../test/stratum3-hello [ -e README ] [ $(git rev-parse HEAD) = $(git rev-parse master) ] |