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/init-nonempty.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/init-nonempty.script')
| -rwxr-xr-x | tests.branching/init-nonempty.script | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests.branching/init-nonempty.script b/tests.branching/init-nonempty.script index 28762d08..3bcb8e88 100755 --- a/tests.branching/init-nonempty.script +++ b/tests.branching/init-nonempty.script @@ -20,5 +20,5 @@ set -eu # Test that "morph init" fails when given the name of an existing, # non-empty directory. -touch "$DATADIR/mine/foo" -"$SRCDIR/scripts/test-morph" init "$DATADIR/mine" +touch "$DATADIR/workspace/foo" +"$SRCDIR/scripts/test-morph" init "$DATADIR/workspace" |