Repository:
git://git.baserock.org/baserock/morph
Branch: samthursfield/petrify-avoid-edited-chunks
Sha1: 0d745b6f488f552a93b5f8b4beba4b0a261bcc7e
Fix required for the tutorial.
Sam Thursfield (1):
morph petrify: Avoid petrifying chunks that have already been edited
morphlib/plugins/branch_and_merge_plugin.py | 57 +++++++++++++++-------
tests.branching/petrify.script | 11 +++--
tests.branching/petrify.stdout | 12 +++++
tests.branching/setup-second-chunk | 69 +++++++++++++++++++++++++++
4 files changed, 128 insertions(+), 21 deletions(-)
create mode 100755 tests.branching/setup-second-chunk
--
1.7.10.4