diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-11 12:29:27 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-11 17:36:40 +0100 |
| commit | b7580d336635b893e2992c066a19dcd9f82acdb8 (patch) | |
| tree | f00d125f926d2756e655877fde6a1db50ee16a22 /tests.branching | |
| parent | e89e2c435fbb83a5b32c954483d29cfbbd549cde (diff) | |
| download | morph-b7580d336635b893e2992c066a19dcd9f82acdb8.tar.gz | |
morph merge: Warn if a merge will cause unexpected petrification
The concept of a component path is new. This is simply a concise way
of referring to a component in an error message, and looks like this:
base-system-x86_64-generic.bsp-x86_64-generic.linux
We currently only touch the 'edited chunks' in merge_stratum(), i.e.
those in the FROM branch where 'morph edit' was run. However, the
petrification can affect any chunk so there is a new method added to
obtain all components in a morphology. This function also returns the
differences between the two, which we will make use of at a later date.
Diffstat (limited to 'tests.branching')
| -rw-r--r-- | tests.branching/merge-handles-unmergable-cases.stderr | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests.branching/merge-handles-unmergable-cases.stderr b/tests.branching/merge-handles-unmergable-cases.stderr index 64c9c34b..ff6539a7 100644 --- a/tests.branching/merge-handles-unmergable-cases.stderr +++ b/tests.branching/merge-handles-unmergable-cases.stderr @@ -1 +1 @@ -ERROR: merge conflict: "kind" of morphology hello-stratum changed from chunk to stratum +ERROR: merge conflict: "kind" of morphology hello-system.hello-stratum changed from stratum to chunk |