summaryrefslogtreecommitdiff
path: root/yarns/implementations.yarn
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-06-09 14:00:26 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-06-09 14:00:26 +0000
commitb6f37209fc277883c983b1602d3a98b4045f6dee (patch)
tree7e502b0a9abe2c736b9f8260a8e984fc91e20539 /yarns/implementations.yarn
parente88455c62914ed70b439b37c2ba64a446cb295c3 (diff)
parent051ed7f0753ac292964019bb00929380f98b2191 (diff)
downloadmorph-b6f37209fc277883c983b1602d3a98b4045f6dee.tar.gz
Merge branch 'baserock/ps/simple-edit-syntax'
Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk> Reviewed-By: Richard Ipsum <richard.ipsum@codethink.co.uk> Reviewed-By: Richard Maw <richard.maw@codethink.co.uk> Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk>
Diffstat (limited to 'yarns/implementations.yarn')
-rw-r--r--yarns/implementations.yarn10
1 files changed, 1 insertions, 9 deletions
diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn
index e4f36399..0635af72 100644
--- a/yarns/implementations.yarn
+++ b/yarns/implementations.yarn
@@ -423,13 +423,9 @@ Editing morphologies with `morph edit`.
"$field" name="$MATCH_4" "$MATCH_5"; } 2>&1 |
grep -qFe "Object does not contain $MATCH_5"
- IMPLEMENTS WHEN the user edits the stratum (\S+) in the system (\S+) in branch (\S+)
- cd "$DATADIR/workspace/$MATCH_3/test/morphs"
- run_morph edit "$MATCH_2" "$MATCH_1"
-
IMPLEMENTS WHEN the user edits the chunk (\S+) in the stratum (\S+) in the system (\S+) in branch (\S+)
cd "$DATADIR/workspace/$MATCH_4/test/morphs"
- run_morph edit "$MATCH_3" "$MATCH_2" "$MATCH_1"
+ run_morph edit "$MATCH_1"
IMPLEMENTS THEN the edited chunk (\S+) has git branch (\S+)
ls -l "$DATADIR/workspace/$MATCH_2"
@@ -439,10 +435,6 @@ Editing morphologies with `morph edit`.
echo "$MATCH_2" > "$DATADIR/git-branch.wanted"
diff -u "$DATADIR/git-branch.wanted" "$DATADIR/git-branch.actual"
- IMPLEMENTS WHEN the user edits the chunk (\S+) in the stratum (\S+) with no system specified in branch (\S+)
- cd "$DATADIR/workspace/$MATCH_3"
- attempt_morph edit "$MATCH_2" "$MATCH_1"
-
To produce buildable morphologies, we need them to be of the same
architecture as the machine doing the testing. This uses `morph
print-architecture` to get a value appropriate for morph.