diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2014-02-12 16:27:32 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-02-13 15:39:37 +0000 |
commit | fbf70e2e5595d0cc7edaf7240a732cc5d2632c34 (patch) | |
tree | 26b563899cecad7f1898c672f6cbf9856993a52b /tests.branching/tag-creates-commit-and-tag.stdout | |
parent | 070bcbd497583955e9069ced7aa2473bce2bc3b5 (diff) | |
download | morph-fbf70e2e5595d0cc7edaf7240a732cc5d2632c34.tar.gz |
Warn and default to null if repo or ref are given
This now means that the system morphology is not altered when chunks are
altered, so some tests had to change.
Since this uses the python warnings API, these warnings can be ignored
by running
python -W ignore:"stratum morphology" \
-W ignore:"system morphology" \
"$(which morph)" ...`
or turned into errors with
python -W error:"stratum morphology" \
-W error:"system morphology" \
"$(which morph)" ...`
Diffstat (limited to 'tests.branching/tag-creates-commit-and-tag.stdout')
-rw-r--r-- | tests.branching/tag-creates-commit-and-tag.stdout | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/tests.branching/tag-creates-commit-and-tag.stdout b/tests.branching/tag-creates-commit-and-tag.stdout index b6098eb5..e1e2126a 100644 --- a/tests.branching/tag-creates-commit-and-tag.stdout +++ b/tests.branching/tag-creates-commit-and-tag.stdout @@ -5,7 +5,7 @@ Date: Tue Jul 31 16:51:54 2012 +0000 Message -commit 6895ed63425bedb3dccaea3f258c705b1600f6be +commit 53a2d5f00aead3f01c001da4b2b5677e25970b06 Author: developer <developer@example.com> Date: Tue Jul 31 16:51:54 2012 +0000 @@ -25,21 +25,9 @@ index 73ed482..2218f63 100644 + unpetrify-ref: master kind: stratum name: hello-stratum -diff --git a/hello-system.morph b/hello-system.morph -index 3f7b4d3..d909347 100644 ---- a/hello-system.morph -+++ b/hello-system.morph -@@ -3,5 +3,6 @@ kind: system - name: hello-system - strata: - - morph: hello-stratum -- ref: master -+ ref: example-tag - repo: test:morphs -+ unpetrify-ref: master test:morphs -commit 6895ed63425bedb3dccaea3f258c705b1600f6be +commit 53a2d5f00aead3f01c001da4b2b5677e25970b06 Author: developer <developer@example.com> AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer <developer@example.com> @@ -47,7 +35,7 @@ CommitDate: Tue Jul 31 16:51:54 2012 +0000 Message -commit e11a36aa9e4c998c41a3ec3209324b9318e484ae +commit acb64a107d0ebdbbf0b6850b8272301a66c0a4b7 Author: developer <developer@example.com> AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer <developer@example.com> |