diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-03 14:44:22 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-03 14:44:32 +0100 |
| commit | 47ccbd4d3d7a2bbfa3c840f442f00528c88f5a45 (patch) | |
| tree | cecfdd96a67fe39ad0ad36e9a1bafb3b429250b4 | |
| parent | ce8732a7d4321e815a90abde5fa9caaa263fbdc1 (diff) | |
| download | morph-47ccbd4d3d7a2bbfa3c840f442f00528c88f5a45.tar.gz | |
Fix after review
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 5 | ||||
| -rw-r--r-- | tests.branching/merge-handles-unmergable-cases.stderr | 2 | ||||
| -rw-r--r-- | tests.branching/merge-with-stratum-renamed.stdout | 0 |
3 files changed, 3 insertions, 4 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 60aabd75..a3faa0c2 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -751,8 +751,6 @@ class BranchAndMergePlugin(cliapp.Plugin): ''' - # FIXME: We should save this in the morph_files dict somehow, to avoid - # rerunning git-merge-base too many times. base_sha1 = self.app.runcmd(['git', 'merge-base', from_sha1, to_ref], cwd=repo_dir).strip() base_morph = self.load_morphology(repo_dir, name, ref=base_sha1) @@ -766,7 +764,8 @@ class BranchAndMergePlugin(cliapp.Plugin): 'match filename)' % name) if from_morph['kind'] != to_morph['kind']: raise cliapp.AppException( - 'merge conflict: "kind" of morphology %s' % name) + 'merge conflict: "kind" of morphology %s changed from %s to %s' + % (name, from_morph['kind'], to_morph['kind'])) return base_morph, from_morph, to_morph diff --git a/tests.branching/merge-handles-unmergable-cases.stderr b/tests.branching/merge-handles-unmergable-cases.stderr index 513db2b8..64c9c34b 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 +ERROR: merge conflict: "kind" of morphology hello-stratum changed from chunk to stratum diff --git a/tests.branching/merge-with-stratum-renamed.stdout b/tests.branching/merge-with-stratum-renamed.stdout deleted file mode 100644 index e69de29b..00000000 --- a/tests.branching/merge-with-stratum-renamed.stdout +++ /dev/null |