diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-12-17 17:33:46 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-12-18 17:22:33 +0000 |
| commit | 7168239ea0059779ffd8e8185aa82cc76ad235d9 (patch) | |
| tree | 44f1fc44854cee84a71f2629311d8aec2f0f5c3f /tests.branching/edit-updates-stratum-build-depends.stdout | |
| parent | a515abc125826416e9ced2a71882d66ac36759b1 (diff) | |
| download | morph-7168239ea0059779ffd8e8185aa82cc76ad235d9.tar.gz | |
morph edit: Update build-depends that refer to the edited stratum
The code took some refactoring. The core functionality is now all inside
one function with make_available() separate, as this is used other places.
The code is still far from perfect, but will hopefully be rewritten to
use the new abstractions of system branches etc. soon
Diffstat (limited to 'tests.branching/edit-updates-stratum-build-depends.stdout')
| -rw-r--r-- | tests.branching/edit-updates-stratum-build-depends.stdout | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/tests.branching/edit-updates-stratum-build-depends.stdout b/tests.branching/edit-updates-stratum-build-depends.stdout new file mode 100644 index 00000000..00010f17 --- /dev/null +++ b/tests.branching/edit-updates-stratum-build-depends.stdout @@ -0,0 +1,48 @@ +diff --git a/hello-stratum.morph b/hello-stratum.morph +index 3b7be17..febfa60 100644 +--- a/hello-stratum.morph ++++ b/hello-stratum.morph +@@ -5,7 +5,7 @@ + { + "name": "hello", + "repo": "test:hello", +- "ref": "master", ++ "ref": "newbranch", + "build-depends": [] + } + ] +diff --git a/hello-system.morph b/hello-system.morph +index 87a47f0..75b0f90 100644 +--- a/hello-system.morph ++++ b/hello-system.morph +@@ -8,12 +8,12 @@ + { + "morph": "hello-stratum", + "repo": "test:morphs", +- "ref": "master" +- }, +- { ++ "ref": "newbranch" ++ }, ++ { + "morph": "xyzzy-stratum", + "repo": "test:morphs", +- "ref": "master" +- } ++ "ref": "newbranch" ++ } + ] + } +diff --git a/xyzzy-stratum.morph b/xyzzy-stratum.morph +index 8f83beb..e0a895a 100644 +--- a/xyzzy-stratum.morph ++++ b/xyzzy-stratum.morph +@@ -5,7 +5,7 @@ + { + "morph": "hello-stratum", + "repo": "test:morphs", +- "ref": "master" ++ "ref": "newbranch" + } + ], + "chunks": [ |