diff options
| author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-08-30 13:35:45 +0000 |
|---|---|---|
| committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-08-30 14:45:06 +0000 |
| commit | 332b39f5df8a70f0c0146189a28d465da493e441 (patch) | |
| tree | f0499b68f227fc3d3c4ae9ad96d49fe5ac1cf8a1 /tests.branching/branch-when-branchdir-exists-locally.stderr | |
| parent | 8247661b26f7232038bac95c64780121e9691db5 (diff) | |
| download | morph-332b39f5df8a70f0c0146189a28d465da493e441.tar.gz | |
Fix branch/checkout to always create branches in the workspace directory
Doing this rather than creating the system branches in the current working
directory allows "morph branch" and "morph checkout" to be run anywhere in
the workspace (e.g. in a different branch).
This commit also adds two tests to verify that new branches are always
created in the toplevel workspace directory.
Diffstat (limited to 'tests.branching/branch-when-branchdir-exists-locally.stderr')
| -rw-r--r-- | tests.branching/branch-when-branchdir-exists-locally.stderr | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests.branching/branch-when-branchdir-exists-locally.stderr b/tests.branching/branch-when-branchdir-exists-locally.stderr index 6c56c250..e178cf2c 100644 --- a/tests.branching/branch-when-branchdir-exists-locally.stderr +++ b/tests.branching/branch-when-branchdir-exists-locally.stderr @@ -1 +1 @@ -ERROR: newbranch: File exists +ERROR: TMP/workspace/newbranch: File exists |