summaryrefslogtreecommitdiff
path: root/yarns/implementations.yarn
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-11-01 14:42:43 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-11-01 14:42:43 +0000
commit0b6516bb591dd51c14993f6e60b0da3197a32054 (patch)
tree30810cdc3a37e9012bfe19d8498e764887f876c7 /yarns/implementations.yarn
parent6d69eb0295f7d51399d8f341444bfcf90f6b0bb5 (diff)
parent8504f029bd2dffd1550b16c50d293aa58290d333 (diff)
downloadmorph-0b6516bb591dd51c14993f6e60b0da3197a32054.tar.gz
Merge remote-tracking branch 'origin/pedroalvarez/S9428'
Diffstat (limited to 'yarns/implementations.yarn')
-rw-r--r--yarns/implementations.yarn6
1 files changed, 5 insertions, 1 deletions
diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn
index 22120130..985ab2bc 100644
--- a/yarns/implementations.yarn
+++ b/yarns/implementations.yarn
@@ -183,10 +183,14 @@ We also need to verify that a system branch has been checked out.
We can create a new branch, off master.
- IMPLEMENTS WHEN creating system branch (\S+)
+ IMPLEMENTS WHEN user creates system branch (\S+)
cd "$DATADIR/workspace"
run_morph branch test:morphs "$MATCH_1"
+ IMPLEMENTS WHEN user attempts to create system branch (\S+)
+ cd "$DATADIR/workspace"
+ attempt_morph branch test:morphs "$MATCH_1"
+
We can create a new branch, off another system branch.
IMPLEMENTS WHEN creating system branch (\S+), based on (\S+)