diff options
| author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-08-28 15:59:42 +0000 |
|---|---|---|
| committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-08-29 18:43:24 +0100 |
| commit | 384689e00d8bed6b1e5373dda6fc407ae9d197b6 (patch) | |
| tree | ca1b18173923db6955f0352e015a7eaa9c589697 /tests.branching/edit-checkouts-existing-chunk.script | |
| parent | bb619f5ca782ab56dbb189f0281e8afd5025ced3 (diff) | |
| download | morph-384689e00d8bed6b1e5373dda6fc407ae9d197b6.tar.gz | |
Rename the "morph minedir" command to "morph workspace"
Mine may be a nice metaphor but it is not very intuitive. Hence, this
commit renames "mine" to "workspace". This affects not just the branch
and merge plugin (the only code that changes) but also documentation
and tests, which are updated along with the code in this commit.
I decided to omit the "dir" suffix in the command because I think
people know well that a workspace will be a directory in this case
and that allows us to refer to this concept with one word ("workspace")
instead of two words ("workspace directory").
Diffstat (limited to 'tests.branching/edit-checkouts-existing-chunk.script')
| -rwxr-xr-x | tests.branching/edit-checkouts-existing-chunk.script | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests.branching/edit-checkouts-existing-chunk.script b/tests.branching/edit-checkouts-existing-chunk.script index 4e88ec7c..a3a8d01e 100755 --- a/tests.branching/edit-checkouts-existing-chunk.script +++ b/tests.branching/edit-checkouts-existing-chunk.script @@ -21,7 +21,7 @@ set -eu # Checkout the master system branch. -cd "$DATADIR/mine" +cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" checkout alfred @@ -30,10 +30,10 @@ cd alfred/morphs "$SRCDIR/scripts/test-morph" edit baserock:hello alfred echo "Current branches, morphs:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/mine/alfred/morphs" branch +"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/alfred/morphs" branch echo "Current branches, hello:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/mine/alfred/hello" branch +"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/alfred/hello" branch echo "Files in hello:" -ls "$DATADIR/mine/alfred/hello" +ls "$DATADIR/workspace/alfred/hello" |