diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-02-18 10:17:38 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-02-18 10:17:38 +0000 |
| commit | 2dd6635be7cb3f07b818eeec45e64a0b795d4e87 (patch) | |
| tree | afd4740cb7e114e935ba987e164dff7dcdc4a59a /tests.branching/edit-updates-stratum.stdout | |
| parent | a859a3377f488ef11ebed2631dbd51b2aa82afe4 (diff) | |
| parent | ed0385399dbd3cfffb9af5838456efbb9183bd48 (diff) | |
| download | morph-2dd6635be7cb3f07b818eeec45e64a0b795d4e87.tar.gz | |
Merge branch 'baserock/richardmaw/S10407/field-order'
Reviewed-by: Lars Wirzenius
Diffstat (limited to 'tests.branching/edit-updates-stratum.stdout')
| -rw-r--r-- | tests.branching/edit-updates-stratum.stdout | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/tests.branching/edit-updates-stratum.stdout b/tests.branching/edit-updates-stratum.stdout index ae1af132..a127f046 100644 --- a/tests.branching/edit-updates-stratum.stdout +++ b/tests.branching/edit-updates-stratum.stdout @@ -1,14 +1,13 @@ diff --git a/hello-stratum.morph b/hello-stratum.morph -index 73ed482..475fe0f 100644 +index e012b5f..cc0609a 100644 --- a/hello-stratum.morph +++ b/hello-stratum.morph -@@ -2,7 +2,8 @@ chunks: - - build-depends: [] - build-mode: test - name: hello +@@ -3,6 +3,7 @@ kind: stratum + chunks: + - name: hello + repo: test:hello - ref: master + ref: newbranch - repo: test:hello + unpetrify-ref: master - kind: stratum - name: hello-stratum + build-depends: [] + build-mode: test |