diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-17 13:43:31 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-18 11:51:00 +0100 |
| commit | c1d2fe7d811b15eb411b976b2619c44f46b8267e (patch) | |
| tree | e410ecc95513da3cc78e4ff742ba3f62850e2418 /tests.branching/petrify.stdout | |
| parent | cf7ed1cb79d4862c92261ac57a27b082a8f10f84 (diff) | |
| download | morph-c1d2fe7d811b15eb411b976b2619c44f46b8267e.tar.gz | |
morph petrify: Avoid petrifying chunks that have already been edited
This change causes 'morph petrify' to avoid petrifying any chunk whose
ref matches the current system branch, because it makes no sense to
petrify something that is also being edited. It also improves efficiency
slightly and adds warning where different systems point to different
refs of the same stratum.
A non-obvious effect of this is that if you try to petrify 'master',
many of the chunks won't get petrified because they are built from
'master'. However, petrifying master makes no sense so I'm not sure
that we need to worry.
Diffstat (limited to 'tests.branching/petrify.stdout')
| -rw-r--r-- | tests.branching/petrify.stdout | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests.branching/petrify.stdout b/tests.branching/petrify.stdout index 249a8f59..6219c84e 100644 --- a/tests.branching/petrify.stdout +++ b/tests.branching/petrify.stdout @@ -9,6 +9,12 @@ Petrified: "ref": "f4d032b42c0134e67bdf19a43fa99072493667d7", "build-depends": [], "unpetrify-ref": "master" + }, + { + "name": "goodbye", + "repo": "baserock:goodbye", + "ref": "test/petrify", + "build-depends": [] } ] } @@ -23,6 +29,12 @@ Unpetrified: "repo": "baserock:hello", "ref": "master", "build-depends": [] + }, + { + "name": "goodbye", + "repo": "baserock:goodbye", + "ref": "test/petrify", + "build-depends": [] } ] } |