diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 09:50:04 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 10:30:31 +0100 |
commit | 6afbad208f42c5f4b2f232988a7ed775b638ec7b (patch) | |
tree | cb3a52a65bf5f251337d6f5edbfbb3e6f569da5f /tests | |
parent | 39003be207b8d6fe57206373587b57c20a38b06f (diff) |
git-debrebase: New merge handing, experimental and preliminary
Classification:
* Classify octopus merges as unknown, separately
* Classify 2-parent general merges as VanillaMerge, if feature enabled
* Introduce new merged-breakwater commit tag, classify as MergedBreakwaters
* Classify other gdr-generated 2-parent merges as unknown
Inspection (keycommits):
* VanillaMerge commits require laundry, much like dgit imports,
and prevent discernment of the actual breakwater and anchor
Laundry (walk):
* Rewrite VanillaMerge using new merge_series function
Test suite:
* We get a slightly different error message in gdr-unprocessable, now.
Later, when we make this non-experimental all the time, we are going
to have to soup up gdr-unprocessable to make a worse test commit.
There are a lot of known bugs and infelicites, marked with "xxx".
There is a test (which will appear in a moment) but it's rather a poor
test, so there will be many uknown bugs.
So all of this is enabled only if GIT_DEBREBASE_EXPERIMENTAL_MERGE is
set in the environment. (Strictly, only the classification is gated,
but that is sufficient.) No significant functional change without
this setting.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/tests/gdr-unprocessable | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/tests/gdr-unprocessable b/tests/tests/gdr-unprocessable index 14d1e8e..5e86522 100755 --- a/tests/tests/gdr-unprocessable +++ b/tests/tests/gdr-unprocessable @@ -14,7 +14,7 @@ t-dgit setup-mergechangelogs subcmd () { cmd=("$@") - branch merge 'complex merge' + branch merge 'general two-parent merge' branch origin 'origin commit' } |