From 5aa34de203939b69d9a2f4c0af0f65a751ff66f3 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Thu, 30 Apr 2015 02:44:21 +0000 Subject: yarns: Add yarn for morph diff Change-Id: If3f6abdaab6518e77da911bfe1952c8ffe4bda34 --- yarns/branches-workspaces.yarn | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'yarns') 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" - -- cgit v1.2.1