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.script | |
| 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.script')
| -rwxr-xr-x | tests.branching/petrify.script | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tests.branching/petrify.script b/tests.branching/petrify.script index 0b5ff018..c1828bf3 100755 --- a/tests.branching/petrify.script +++ b/tests.branching/petrify.script @@ -15,7 +15,8 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Verify that "morph petrify" works. +# Verify "morph petrify", and ensure it doesn't petrify chunks that have +# already been edited. set -eu @@ -28,11 +29,15 @@ then exit 0 fi +. "$SRCDIR/tests.branching/setup-second-chunk" + cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master +"$SRCDIR/scripts/test-morph" branch baserock:morphs test/petrify master + +cd test/petrify/baserock:morphs +"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum goodbye -cd master/baserock:morphs "$SRCDIR/scripts/test-morph" petrify echo "Petrified:" cat hello-stratum.morph |