diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-01-20 19:41:28 +0000 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2018-01-21 11:47:43 +0000 |
| commit | 185b0d0823869bf180bb1d3541dd1dc0ca2447fe (patch) | |
| tree | d1591341f4de9a157ef2f33551a9cd4d72e6b6b5 /tests/merge | |
| parent | b8e9467a4b7f76c711103c9722deaf8c828d9abc (diff) | |
| download | libgit2-185b0d0823869bf180bb1d3541dd1dc0ca2447fe.tar.gz | |
merge: recursive uses larger conflict markers
Git uses longer conflict markers in the recursive merge base - two more
than the default (thus, 9 character long conflict markers). This allows
users to tell the difference between the recursive merge conflicts and
conflicts between the ours and theirs branches.
This was introduced in git d694a17986a28bbc19e2a6c32404ca24572e400f.
Update our tests to expect this as well.
Diffstat (limited to 'tests/merge')
| -rw-r--r-- | tests/merge/conflict_data.h | 8 | ||||
| -rw-r--r-- | tests/merge/trees/recursive.c | 4 | ||||
| -rw-r--r-- | tests/merge/workdir/recursive.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/merge/conflict_data.h b/tests/merge/conflict_data.h index e6394a9e8..7d404c81f 100644 --- a/tests/merge/conflict_data.h +++ b/tests/merge/conflict_data.h @@ -76,13 +76,13 @@ "<<<<<<< HEAD\n" \ "put into a pot three quarts of water, three onions cut small, one\n" \ "||||||| merged common ancestors\n" \ - "<<<<<<< Temporary merge branch 1\n" \ + "<<<<<<<<< Temporary merge branch 1\n" \ "Put into a pot three quarts of water, THREE ONIONS CUT SMALL, one\n" \ - "||||||| merged common ancestors\n" \ + "||||||||| merged common ancestors\n" \ "Put into a pot three quarts of water, three onions cut small, one\n" \ - "=======\n" \ + "=========\n" \ "PUT INTO A POT three quarts of water, three onions cut small, one\n" \ - ">>>>>>> Temporary merge branch 2\n" \ + ">>>>>>>>> Temporary merge branch 2\n" \ "=======\n" \ "Put Into A Pot Three Quarts of Water, Three Onions Cut Small, One\n" \ ">>>>>>> branchH-2\n" \ diff --git a/tests/merge/trees/recursive.c b/tests/merge/trees/recursive.c index c5b129bf8..1d54d87b1 100644 --- a/tests/merge/trees/recursive.c +++ b/tests/merge/trees/recursive.c @@ -312,7 +312,7 @@ void test_merge_trees_recursive__conflicting_merge_base(void) { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, - { 0100644, "3a66812fed1e03ea4a6a7ee28d8a57aec1ca6537", 1, "veal.txt" }, + { 0100644, "ba5714aa3d5aebfd8e19d19cb1ddcfda63426a44", 1, "veal.txt" }, { 0100644, "d604c75019c282144bdbbf3fd3462ba74b240efc", 2, "veal.txt" }, { 0100644, "37a5054a9f9b4628e3924c5cb8f2147c6e2a3efc", 3, "veal.txt" }, }; @@ -339,7 +339,7 @@ void test_merge_trees_recursive__conflicting_merge_base_with_diff3(void) { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, - { 0100644, "cd17a91513f3aee9e44114d1ede67932dd41d2fc", 1, "veal.txt" }, + { 0100644, "adb1bf17d112a0b4ecbd4e75bef6db3335d8ddcf", 1, "veal.txt" }, { 0100644, "d604c75019c282144bdbbf3fd3462ba74b240efc", 2, "veal.txt" }, { 0100644, "37a5054a9f9b4628e3924c5cb8f2147c6e2a3efc", 3, "veal.txt" }, }; diff --git a/tests/merge/workdir/recursive.c b/tests/merge/workdir/recursive.c index 795126255..3c745947c 100644 --- a/tests/merge/workdir/recursive.c +++ b/tests/merge/workdir/recursive.c @@ -44,7 +44,7 @@ void test_merge_workdir_recursive__writes_conflict_with_virtual_base(void) cl_git_pass(git_futils_readbuffer(&conflicting_buf, "merge-recursive/veal.txt")); cl_assert_equal_s(CONFLICTING_RECURSIVE_F1_TO_F2, conflicting_buf.ptr); - + git_index_free(index); git_buf_free(&conflicting_buf); } @@ -62,7 +62,7 @@ void test_merge_workdir_recursive__conflicting_merge_base_with_diff3(void) { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, - { 0100644, "cd17a91513f3aee9e44114d1ede67932dd41d2fc", 1, "veal.txt" }, + { 0100644, "adb1bf17d112a0b4ecbd4e75bef6db3335d8ddcf", 1, "veal.txt" }, { 0100644, "d604c75019c282144bdbbf3fd3462ba74b240efc", 2, "veal.txt" }, { 0100644, "37a5054a9f9b4628e3924c5cb8f2147c6e2a3efc", 3, "veal.txt" }, }; |