thodg/libgit2/tests/merge/conflict_data.h
-
Show log
Commit
-
Hash : 78859c63
Author :
Date : 2015-11-20T17:33:49
merge: handle conflicts in recursive base building When building a recursive merge base, allow conflicts to occur. Use the file (with conflict markers) as the common ancestor. The user has already seen and dealt with this conflict by virtue of having a criss-cross merge. If they resolved this conflict identically in both branches, then there will be no conflict in the result. This is the best case scenario. If they did not resolve the conflict identically in the two branches, then we will generate a new conflict. If the user is simply using standard conflict output then the results will be fairly sensible. But if the user is using a mergetool or using diff3 output, then the common ancestor will be a conflict file (itself with diff3 output, haha!). This is quite terrible, but it matches git's behavior.
-
tests/merge/conflict_data.h
-
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103
#define AUTOMERGEABLE_MERGED_FILE \ "this file is changed in master\n" \ "this file is automergeable\n" \ "this file is automergeable\n" \ "this file is automergeable\n" \ "this file is automergeable\n" \ "this file is automergeable\n" \ "this file is automergeable\n" \ "this file is automergeable\n" \ "this file is changed in branch\n" #define AUTOMERGEABLE_MERGED_FILE_CRLF \ "this file is changed in master\r\n" \ "this file is automergeable\r\n" \ "this file is automergeable\r\n" \ "this file is automergeable\r\n" \ "this file is automergeable\r\n" \ "this file is automergeable\r\n" \ "this file is automergeable\r\n" \ "this file is automergeable\r\n" \ "this file is changed in branch\r\n" #define CONFLICTING_MERGE_FILE \ "<<<<<<< HEAD\n" \ "this file is changed in master and branch\n" \ "=======\n" \ "this file is changed in branch and master\n" \ ">>>>>>> 7cb63eed597130ba4abb87b3e544b85021905520\n" #define CONFLICTING_DIFF3_FILE \ "<<<<<<< HEAD\n" \ "this file is changed in master and branch\n" \ "||||||| initial\n" \ "this file is a conflict\n" \ "=======\n" \ "this file is changed in branch and master\n" \ ">>>>>>> 7cb63eed597130ba4abb87b3e544b85021905520\n" #define CONFLICTING_UNION_FILE \ "this file is changed in master and branch\n" \ "this file is changed in branch and master\n" #define CONFLICTING_RECURSIVE_F1_TO_F2 \ "VEAL SOUP.\n" \ "\n" \ "<<<<<<< HEAD\n" \ "PUT INTO A POT THREE QUARTS OF WATER, three onions cut small, ONE\n" \ "=======\n" \ "PUT INTO A POT THREE QUARTS OF WATER, three onions cut not too small, one\n" \ ">>>>>>> branchF-2\n" \ "spoonful of black pepper pounded, and two of salt, with two or three\n" \ "slices of lean ham; let it boil steadily two hours; skim it\n" \ "occasionally, then put into it a shin of veal, let it boil two hours\n" \ "longer; take out the slices of ham, and skim off the grease if any\n" \ "should rise, take a gill of good cream, mix with it two table-spoonsful\n" \ "of flour very nicely, and the yelks of two eggs beaten well, strain this\n" \ "mixture, and add some chopped parsley; pour some soup on by degrees,\n" \ "stir it well, and pour it into the pot, continuing to stir until it has\n" \ "boiled two or three minutes to take off the raw taste of the eggs. If\n" \ "the cream be not perfectly sweet, and the eggs quite new, the thickening\n" \ "will curdle in the soup. For a change you may put a dozen ripe tomatos\n" \ "in, first taking off their skins, by letting them stand a few minutes in\n" \ "hot water, when they may be easily peeled. When made in this way you\n" \ "must thicken it with the flour only. Any part of the veal may be used,\n" \ "but the shin or knuckle is the nicest.\n" \ "\n" \ "<<<<<<< HEAD\n" \ "This certainly is a mighty fine recipe.\n" \ "=======\n" \ "This is a mighty fine recipe!\n" \ ">>>>>>> branchF-2\n" #define CONFLICTING_RECURSIVE_H1_TO_H2_WITH_DIFF3 \ "VEAL SOUP.\n" \ "\n" \ "<<<<<<< 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" \ "Put into a pot three quarts of water, THREE ONIONS CUT SMALL, one\n" \ "||||||| merged common ancestors\n" \ "Put into a pot three quarts of water, three onions cut small, one\n" \ "=======\n" \ "PUT INTO A POT three quarts of water, three onions cut small, one\n" \ ">>>>>>> Temporary merge branch 2\n" \ "=======\n" \ "Put Into A Pot Three Quarts of Water, Three Onions Cut Small, One\n" \ ">>>>>>> branchH-2\n" \ "spoonful of black pepper pounded, and two of salt, with two or three\n" \ "slices of lean ham; let it boil steadily two hours; skim it\n" \ "occasionally, then put into it a shin of veal, let it boil two hours\n" \ "longer; take out the slices of ham, and skim off the grease if any\n" \ "should rise, take a gill of good cream, mix with it two table-spoonsful\n" \ "of flour very nicely, and the yelks of two eggs beaten well, strain this\n" \ "mixture, and add some chopped parsley; pour some soup on by degrees,\n" \ "stir it well, and pour it into the pot, continuing to stir until it has\n" \ "boiled two or three minutes to take off the raw taste of the eggs. If\n" \ "the cream be not perfectly sweet, and the eggs quite new, the thickening\n" \ "will curdle in the soup. For a change you may put a dozen ripe tomatos\n" \ "in, first taking off their skins, by letting them stand a few minutes in\n" \ "hot water, when they may be easily peeled. When made in this way you\n" \ "must thicken it with the flour only. Any part of the veal may be used,\n" \ "but the shin or knuckle is the nicest.\n"