diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-02-17 14:28:15 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-02-17 14:28:15 +0000 |
| commit | a859a3377f488ef11ebed2631dbd51b2aa82afe4 (patch) | |
| tree | d6c141557430c6a808abd80c9fdbf26c44ba1eea /yarns/branches-workspaces.yarn | |
| parent | 8f8fc96b884e7f175d4a01bc2d91452d7149bf33 (diff) | |
| parent | d036610974f229a806d682c6d051c299f6396d2f (diff) | |
| download | morph-a859a3377f488ef11ebed2631dbd51b2aa82afe4.tar.gz | |
Merge remote-tracking branch 'origin/baserock/richardmaw/10312/ensure-not-add-repo-ref'
This includes a typo fix of Unpertify -> Unpetrify
Reviewed-by: Lars Wirzenius
Diffstat (limited to 'yarns/branches-workspaces.yarn')
| -rw-r--r-- | yarns/branches-workspaces.yarn | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/yarns/branches-workspaces.yarn b/yarns/branches-workspaces.yarn index 15d31cb1..c3b73ee3 100644 --- a/yarns/branches-workspaces.yarn +++ b/yarns/branches-workspaces.yarn @@ -197,6 +197,12 @@ purposes. THEN in branch foo, stratum test-stratum refs test-chunk in foo AND the edited chunk test:test-chunk has git branch foo +Editing a morphology should not cause it to start having repo or ref +fields when referring to strata, when it didn't before. + + AND in branch foo, system test-system refers to test-stratum without repo + AND in branch foo, system test-system refers to test-stratum without ref + Morph edit should only work with a system argument. SCENARIO morph edit errors when supplied only a stratum and chunk as arguments @@ -267,9 +273,25 @@ unpetrify and verify that we have all the same refs as before. AND remembering all refs in foo AND petrifying foo THEN foo is petrified + +Petrifying a morphology should not cause it to start having repo or ref +fields when referring to strata, when it didn't before. + + AND in branch foo, system test-system refers to test-stratum without repo + AND in branch foo, system test-system refers to test-stratum without ref + +Unpetrify must put the morphologies back in the same logical state they +were in before. + WHEN unpetrifying foo THEN foo refs are as remembered +Unpetrifying a morphology should not cause it to start having repo or +ref fields when referring to strata, when it didn't before. + + AND in branch foo, system test-system refers to test-stratum without repo + AND in branch foo, system test-system refers to test-stratum without ref + Tagging system branches ----------------------- |