summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2015-04-30 02:44:21 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2015-05-11 13:14:11 +0000
commit5aa34de203939b69d9a2f4c0af0f65a751ff66f3 (patch)
tree831a16c0bb6d0904ef50865628c1a5e26312009c
parent2d2774a3b84ce9dba9b4445e842801c2768cdaa3 (diff)
downloadmorph-5aa34de203939b69d9a2f4c0af0f65a751ff66f3.tar.gz
yarns: Add yarn for morph diff
Change-Id: If3f6abdaab6518e77da911bfe1952c8ffe4bda34
-rw-r--r--yarns/branches-workspaces.yarn22
1 files changed, 22 insertions, 0 deletions
diff --git a/yarns/branches-workspaces.yarn b/yarns/branches-workspaces.yarn
index 036fbec5..fa6e815c 100644
--- a/yarns/branches-workspaces.yarn
+++ b/yarns/branches-workspaces.yarn
@@ -613,3 +613,25 @@ Generating a manifest works
AND a system artifact
WHEN morph generates a manifest
THEN the manifest is generated
+
+Definition diffing
+------------------
+
+ SCENARIO diff reporting changes
+ GIVEN a workspace
+ AND a git server
+
+ WHEN the user checks out the system branch called master
+ AND chunk repository test-chunk is re-tagged as test-tag
+ AND chunk test-chunk in stratum strata/core.morph in system branch master is updated to use HEAD from chunk repository test-chunk
+ AND the user commits all changes in system branch master
+ AND the user requests a definition diff on all systems on branches HEAD and HEAD^ in system branch master
+
+ THEN morph succeeded
+ AND morph output test-tag
+
+### diff implementations
+
+ IMPLEMENTS WHEN the user requests a definition diff on all systems on branches (\S+) and (\S+) in system branch (\S+)
+ repo="$DATADIR/workspace/$MATCH_3/test/morphs"
+ attempt_morph diff "$repo" "$MATCH_1" - "$repo" "$MATCH_2" -