summaryrefslogtreecommitdiff
path: root/tests.branching/setup
diff options
context:
space:
mode:
authorJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-08-28 15:59:42 +0000
committerJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-08-29 18:43:24 +0100
commit384689e00d8bed6b1e5373dda6fc407ae9d197b6 (patch)
treeca1b18173923db6955f0352e015a7eaa9c589697 /tests.branching/setup
parentbb619f5ca782ab56dbb189f0281e8afd5025ced3 (diff)
downloadmorph-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/setup')
-rwxr-xr-xtests.branching/setup8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests.branching/setup b/tests.branching/setup
index 84d1d545..1705c9b4 100755
--- a/tests.branching/setup
+++ b/tests.branching/setup
@@ -18,7 +18,7 @@
# Set up $DATADIR.
#
# - a morph.conf configuration file
-# - an empty morph mine directory
+# - an empty morph workspace directory
# - a git repository called "morphs" for fake system, stratum morphologies
# - a git repository calle "hello" for a dummy chunk
@@ -41,7 +41,7 @@ GIT_COMMITTER_DATE="1343753514 +0000"
cat <<EOF > "$DATADIR/morph.conf"
[config]
repo-alias = baserock=file://$DATADIR/%s#file://$DATADIR/%s
-cachedir = $DATADIR/mine/.morph/cache
+cachedir = $DATADIR/workspace/.morph/cache
log = $DATADIR/morph.log
keep-path = true
no-distcc = true
@@ -49,8 +49,8 @@ quiet = true
EOF
-# Create an empty directory to be used as a morph mine
-mkdir "$DATADIR/mine"
+# Create an empty directory to be used as a morph workspace
+mkdir "$DATADIR/workspace"
# Create a fake morphs repository