diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-08-28 14:22:01 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-08-29 15:07:32 +0000 |
| commit | b6b219d75ef63ca33a10cb6cd32dd9b1669ecfa8 (patch) | |
| tree | 6eeb99eed605ef6c9944d2781ce57fed10361f10 /yarns | |
| parent | f3293ecbda184248ea370aa8a419968cb005ba03 (diff) | |
| download | morph-b6b219d75ef63ca33a10cb6cd32dd9b1669ecfa8.tar.gz | |
Revert "Merge branch 'liw/restore-old-cmds'"
This reverts commit 2dc382a2a9ae977b1158002cd2631ec5593959c1, reversing
changes made to 89a019af088ff62459699a6efdadf8ac8fe35dd9.
We decided to restore the old commands for the release, as we weren't
confident the new implementations were correct yet.
To gain that confidence we need to use them, so the old versions are no
longer available, and the new edit code is used when the edit subcommand
is invoked.
Doing so also requires the test suite to use the edit command instead of
new-edit.
Diffstat (limited to 'yarns')
| -rw-r--r-- | yarns/branches-workspaces.yarn | 2 | ||||
| -rw-r--r-- | yarns/implementations.yarn | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/yarns/branches-workspaces.yarn b/yarns/branches-workspaces.yarn index 7c8715a7..3af362a1 100644 --- a/yarns/branches-workspaces.yarn +++ b/yarns/branches-workspaces.yarn @@ -90,7 +90,7 @@ to check for that locally. Similarly, attempting to branch a system branch should fail if the repository does not contain any system morphologies. - SCENARIO branching a system branch with no systems + SCENARIO checking out a system branch with no systems GIVEN a workspace AND a git server WHEN morph attempts to branch a repository with no systems diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn index cc3ef3e5..cfb744f7 100644 --- a/yarns/implementations.yarn +++ b/yarns/implementations.yarn @@ -226,11 +226,11 @@ Editing morphologies with `morph edit`. IMPLEMENTS WHEN editing stratum (\S+) in system (\S+) in branch (\S+) cd "$DATADIR/workspace/$MATCH_3/test:morphs" - run_morph new-edit "$MATCH_2" "$MATCH_1" + run_morph edit "$MATCH_2" "$MATCH_1" IMPLEMENTS WHEN editing chunk (\S+) in (\S+) in (\S+) in branch (\S+) cd "$DATADIR/workspace/$MATCH_4/test:morphs" - run_morph new-edit "$MATCH_3" "$MATCH_2" "$MATCH_1" + run_morph edit "$MATCH_3" "$MATCH_2" "$MATCH_1" IMPLEMENTS THEN edited chunk (\S+) has git branch (\S+) ls -l "$DATADIR/workspace/$MATCH_2" |