From 384689e00d8bed6b1e5373dda6fc407ae9d197b6 Mon Sep 17 00:00:00 2001 From: Jannis Pohlmann Date: Tue, 28 Aug 2012 15:59:42 +0000 Subject: 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"). --- tests.branching/init-nonempty.script | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests.branching/init-nonempty.script') 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" -- cgit v1.2.1