Repository:
git://git.baserock.org/baserock/morph
Branch: samthursfield/petrify-avoid-edited-chunks
Sha1: c1d2fe7d811b15eb411b976b2619c44f46b8267e
Sam Thursfield (1):
morph petrify: Avoid petrifying chunks that have already been edited
Fixes a bug in code which caused tests.branching/workflow-petrify to
fail
Fixed tests.branching/petrify-no-double-petrify to not fail
morphlib/plugins/branch_and_merge_plugin.py | 57 ++++++++++++------
tests.branching/petrify-no-double-petrify.script | 4 +-
tests.branching/petrify.script | 11 +++-
tests.branching/petrify.stdout | 12 ++++
tests.branching/setup-second-chunk | 69 ++++++++++++++++++++++
5 files changed, 130 insertions(+), 23 deletions(-)
create mode 100755 tests.branching/setup-second-chunk
--
1.7.10.4