diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-10-08 15:53:21 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-10-08 15:53:21 +0000 |
| commit | 6e36e9a1a29495f0c8b62fedddadcf8df78506d9 (patch) | |
| tree | 609fc24eaf3d9ac9ed14d6520cccae147a7f3907 /tests.branching/edit-updates-stratum-build-depends.stdout | |
| parent | c63bd810e953429b728adbadf60f10a08e6d4a06 (diff) | |
| parent | f4aaea23b7d80084504832d6b967a50c2d501b9e (diff) | |
| download | morph-6e36e9a1a29495f0c8b62fedddadcf8df78506d9.tar.gz | |
Merge remote-tracking branch 'origin/danielfirth/RT189'
Changed the error (exception) to list all obsolete fields.
Diffstat (limited to 'tests.branching/edit-updates-stratum-build-depends.stdout')
| -rw-r--r-- | tests.branching/edit-updates-stratum-build-depends.stdout | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/tests.branching/edit-updates-stratum-build-depends.stdout b/tests.branching/edit-updates-stratum-build-depends.stdout index 1c6eb8e3..7120ef50 100644 --- a/tests.branching/edit-updates-stratum-build-depends.stdout +++ b/tests.branching/edit-updates-stratum-build-depends.stdout @@ -13,10 +13,10 @@ index 73ed482..475fe0f 100644 kind: stratum name: hello-stratum diff --git a/hello-system.morph b/hello-system.morph -index 721473c..1537f53 100644 +index 3f7b4d3..199c924 100644 --- a/hello-system.morph +++ b/hello-system.morph -@@ -3,9 +3,9 @@ kind: system +@@ -3,5 +3,6 @@ kind: system name: hello-system strata: - morph: hello-stratum @@ -24,27 +24,3 @@ index 721473c..1537f53 100644 + ref: newbranch repo: test:morphs + unpetrify-ref: master - - morph: xyzzy-stratum - ref: master - repo: test:morphs --system-kind: rootfs-tarball -diff --git a/xyzzy-stratum.morph b/xyzzy-stratum.morph -index e302037..bcf5b57 100644 ---- a/xyzzy-stratum.morph -+++ b/xyzzy-stratum.morph -@@ -1,11 +1,13 @@ - build-depends: - - morph: hello-stratum -- ref: master -+ ref: newbranch - repo: test:morphs -+ unpetrify-ref: master - chunks: - - build-depends: [] - name: hello -- ref: master -+ ref: newbranch - repo: test:hello -+ unpetrify-ref: master - kind: stratum - name: xyzzy-stratum |