diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-09-02 13:32:47 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-09-05 09:46:37 +0000 |
| commit | b16e99a71980e9f10ff719d749ad8e453704ea83 (patch) | |
| tree | 3084be822f8b0091eb98b0d62e168dc02b4a65b5 /tests.branching/workflow.stdout | |
| parent | 400f77f81bc02c7c56f67f93d9eb53cbd08bf53d (diff) | |
| download | morph-b16e99a71980e9f10ff719d749ad8e453704ea83.tar.gz | |
MorphSet: keep old ref as unpetrify-ref
This makes petrify much simpler, since adding unpetrify-ref is handled
by MorphSet.
This has the side-effect of adding unpetrify-ref when editing, but this
information is also useful for this use-case.
The edit tests now have different diffs and commits, so those have been
updated.
Also, the old merge code currently warns that now there appears to be
petrified changes, since it detects if a branch is petrified by the
presence of the unpetrify-ref field, even though the ref is not a SHA1.
The old code does not handle undoing an edit the new way, so I did not
feel it was worth attempting to comprehend it to fix this bug, which
will be later fixed by the introduction of the new merge code.
Diffstat (limited to 'tests.branching/workflow.stdout')
| -rw-r--r-- | tests.branching/workflow.stdout | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests.branching/workflow.stdout b/tests.branching/workflow.stdout new file mode 100644 index 00000000..65985486 --- /dev/null +++ b/tests.branching/workflow.stdout @@ -0,0 +1 @@ +WARNING: chunk "hello-system.hello-stratum.hello" is now petrified |