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/tag-creates-commit-and-tag.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/tag-creates-commit-and-tag.stdout')
-rw-r--r-- | tests.branching/tag-creates-commit-and-tag.stdout | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/tests.branching/tag-creates-commit-and-tag.stdout b/tests.branching/tag-creates-commit-and-tag.stdout index e1e2126a..335e6a31 100644 --- a/tests.branching/tag-creates-commit-and-tag.stdout +++ b/tests.branching/tag-creates-commit-and-tag.stdout @@ -5,29 +5,28 @@ Date: Tue Jul 31 16:51:54 2012 +0000 Message -commit 53a2d5f00aead3f01c001da4b2b5677e25970b06 +commit 74b7fcdd21ac4756e473eb8a577caaabeab208b0 Author: developer <developer@example.com> Date: Tue Jul 31 16:51:54 2012 +0000 Message diff --git a/hello-stratum.morph b/hello-stratum.morph -index 73ed482..2218f63 100644 +index e012b5f..50da61b 100644 --- a/hello-stratum.morph +++ b/hello-stratum.morph -@@ -2,7 +2,8 @@ chunks: - - build-depends: [] - build-mode: test - name: hello -- ref: master -+ ref: 6c7ddb7a9c0c5bf4ee02a8de030f0892a399c6bb +@@ -3,6 +3,7 @@ kind: stratum + chunks: + - name: hello repo: test:hello +- ref: master ++ ref: 293fa0b08f0382c63181c36b6efa602876aa8c87 + unpetrify-ref: master - kind: stratum - name: hello-stratum + build-depends: [] + build-mode: test test:morphs -commit 53a2d5f00aead3f01c001da4b2b5677e25970b06 +commit 74b7fcdd21ac4756e473eb8a577caaabeab208b0 Author: developer <developer@example.com> AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer <developer@example.com> @@ -35,7 +34,7 @@ CommitDate: Tue Jul 31 16:51:54 2012 +0000 Message -commit acb64a107d0ebdbbf0b6850b8272301a66c0a4b7 +commit dc323150575be26e3df0d2dab678560c04281b9f Author: developer <developer@example.com> AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer <developer@example.com> |