diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-13 13:57:45 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-17 13:50:20 +0100 |
| commit | 3319a8469eafa15eda5e16bea71c0fcdff23a92c (patch) | |
| tree | 06c7d0857922fd72d310d15c642a6d884a7dff3e /tests.branching/merge-handles-unmergable-cases.stderr | |
| parent | f7e02d76ec22bda2a0dfcd24f44a4df8544fae02 (diff) | |
| download | morph-3319a8469eafa15eda5e16bea71c0fcdff23a92c.tar.gz | |
tests.branching: Add complex merge tests
* Spot completely unmergable cases
* Make sure that changes in a chunk repo are merged to the back to
that chunk's original ref, which is not necessarily the same as
the TO system branch.
* Test renaming a chunk (works fine if repo is the same)
* Try adding a new chunk or stratum and editing it too.
Diffstat (limited to 'tests.branching/merge-handles-unmergable-cases.stderr')
| -rw-r--r-- | tests.branching/merge-handles-unmergable-cases.stderr | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests.branching/merge-handles-unmergable-cases.stderr b/tests.branching/merge-handles-unmergable-cases.stderr new file mode 100644 index 00000000..513db2b8 --- /dev/null +++ b/tests.branching/merge-handles-unmergable-cases.stderr @@ -0,0 +1 @@ +ERROR: merge conflict: "kind" of morphology hello-stratum |