summaryrefslogtreecommitdiff log msg author committer range
blob: 72bc12216b1b6d819fe9ab043981ce3f4e5ecbdc (plain)
 ```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 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 ``` ``````#!/bin/sh # # Copyright (c) 2005 Junio C Hamano #   test_description='Three way merge with read-tree -m   This test tries three-way merge with read-tree -m   There is one ancestor (called O for Original) and two branches A and B derived from it. We want to do a 3-way merge between A and B, using O as the common ancestor.   merge A O B   Decisions are made by comparing contents of O, A and B pathname by pathname. The result is determined by the following guiding principle:   - If only A does something to it and B does not touch it, take whatever A does.   - If only B does something to it and A does not touch it, take whatever B does.   - If both A and B does something but in the same way, take whatever they do.   - If A and B does something but different things, we need a 3-way merge:   - We cannot do anything about the following cases:   * O does not have it. A and B both must be adding to the same path independently.   * A deletes it. B must be modifying.   - Otherwise, A and B are modifying. Run 3-way merge.   First, the case matrix.   - Vertical axis is for A'\''s actions. - Horizontal axis is for B'\''s actions.   .----------------------------------------------------------------. | A B | No Action | Delete | Modify | Add | |------------+------------+------------+------------+------------| | No Action | | | | | | | select O | delete | select B | select B | | | | | | | |------------+------------+------------+------------+------------| | Delete | | | ********** | can | | | delete | delete | merge | not | | | | | | happen | |------------+------------+------------+------------+------------| | Modify | | ********** | ?????????? | can | | | select A | merge | select A=B | not | | | | | merge | happen | |------------+------------+------------+------------+------------| | Add | | can | can | ?????????? | | | select A | not | not | select A=B | | | | happen | happen | merge | .----------------------------------------------------------------.   In addition:   SS: a special case of MM, where A and B makes the same modification. LL: a special case of AA, where A and B creates the same file. TT: a special case of MM, where A and B makes mergeable changes. DF: a special case, where A makes a directory and B makes a file.   ' . ./test-lib.sh . ../lib-read-tree-m-3way.sh   ################################################################ # Try merging and showing the various diffs   test_expect_success \ '3-way merge with git-read-tree -m' \ "git-read-tree -m \$tree_O \$tree_A \$tree_B"   _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' _x40="\$_x40\$_x40\$_x40\$_x40\$_x40\$_x40\$_x40\$_x40" test_expect_success \ 'git-ls-files --stage of the merge result' \ 'git-ls-files --stage >current- && sed -e "s/ \$_x40 / X /" current'   cat >expected <<\EOF 100644 X 2 AA 100644 X 3 AA 100644 X 2 AN 100644 X 1 DD 100644 X 3 DF 100644 X 2 DF/DF 100644 X 1 DM 100644 X 3 DM 100644 X 1 DN 100644 X 3 DN 100644 X 2 LL 100644 X 3 LL 100644 X 1 MD 100644 X 2 MD 100644 X 1 MM 100644 X 2 MM 100644 X 3 MM 100644 X 0 MN 100644 X 3 NA 100644 X 1 ND 100644 X 2 ND 100644 X 0 NM 100644 X 0 NN 100644 X 0 SS 100644 X 1 TT 100644 X 2 TT 100644 X 3 TT 100644 X 2 Z/AA 100644 X 3 Z/AA 100644 X 2 Z/AN 100644 X 1 Z/DD 100644 X 1 Z/DM 100644 X 3 Z/DM 100644 X 1 Z/DN 100644 X 3 Z/DN 100644 X 1 Z/MD 100644 X 2 Z/MD 100644 X 1 Z/MM 100644 X 2 Z/MM 100644 X 3 Z/MM 100644 X 0 Z/MN 100644 X 3 Z/NA 100644 X 1 Z/ND 100644 X 2 Z/ND 100644 X 0 Z/NM 100644 X 0 Z/NN EOF   test_expect_success \ 'validate merge result' \ 'diff current expected'   test_done  ``````