| 1 | : Included from t1000-read-tree-m-3way.sh and others |
| 2 | # Original tree. |
| 3 | mkdir Z |
| 4 | for a in N D M |
| 5 | do |
| 6 | for b in N D M |
| 7 | do |
| 8 | p=$a$b |
| 9 | echo This is $p from the original tree. >$p |
| 10 | echo This is Z/$p from the original tree. >Z/$p |
| 11 | test_expect_success "adding test file $p and Z/$p" ' |
| 12 | git update-index --add $p && |
| 13 | git update-index --add Z/$p |
| 14 | ' |
| 15 | done |
| 16 | done |
| 17 | echo This is SS from the original tree. >SS |
| 18 | test_expect_success 'adding test file SS' ' |
| 19 | git update-index --add SS |
| 20 | ' |
| 21 | cat >TT <<\EOF |
| 22 | This is a trivial merge sample text. |
| 23 | Branch A is expected to upcase this word, here. |
| 24 | There are some filler lines to avoid diff context |
| 25 | conflicts here, |
| 26 | like this one, |
| 27 | and this one, |
| 28 | and this one is yet another one of them. |
| 29 | At the very end, here comes another line, that is |
| 30 | the word, expected to be upcased by Branch B. |
| 31 | This concludes the trivial merge sample file. |
| 32 | EOF |
| 33 | test_expect_success 'adding test file TT' ' |
| 34 | git update-index --add TT |
| 35 | ' |
| 36 | test_expect_success 'prepare initial tree' ' |
| 37 | tree_O=$(git write-tree) |
| 38 | ' |
| 39 | |
| 40 | ################################################################ |
| 41 | # Branch A and B makes the changes according to the above matrix. |
| 42 | |
| 43 | ################################################################ |
| 44 | # Branch A |
| 45 | |
| 46 | to_remove=$(echo D? Z/D?) |
| 47 | rm -f $to_remove |
| 48 | test_expect_success 'change in branch A (removal)' ' |
| 49 | git update-index --remove $to_remove |
| 50 | ' |
| 51 | |
| 52 | for p in M? Z/M? |
| 53 | do |
| 54 | echo This is modified $p in the branch A. >$p |
| 55 | test_expect_success 'change in branch A (modification)' ' |
| 56 | git update-index $p |
| 57 | ' |
| 58 | done |
| 59 | |
| 60 | for p in AN AA Z/AN Z/AA |
| 61 | do |
| 62 | echo This is added $p in the branch A. >$p |
| 63 | test_expect_success 'change in branch A (addition)' ' |
| 64 | git update-index --add $p |
| 65 | ' |
| 66 | done |
| 67 | |
| 68 | echo This is SS from the modified tree. >SS |
| 69 | echo This is LL from the modified tree. >LL |
| 70 | test_expect_success 'change in branch A (addition)' ' |
| 71 | git update-index --add LL && |
| 72 | git update-index SS |
| 73 | ' |
| 74 | mv TT TT- |
| 75 | sed -e '/Branch A/s/word/WORD/g' <TT- >TT |
| 76 | rm -f TT- |
| 77 | test_expect_success 'change in branch A (edit)' ' |
| 78 | git update-index TT |
| 79 | ' |
| 80 | |
| 81 | mkdir DF |
| 82 | echo Branch A makes a file at DF/DF, creating a directory DF. >DF/DF |
| 83 | test_expect_success 'change in branch A (change file to directory)' ' |
| 84 | git update-index --add DF/DF |
| 85 | ' |
| 86 | |
| 87 | test_expect_success 'recording branch A tree' ' |
| 88 | tree_A=$(git write-tree) |
| 89 | ' |
| 90 | |
| 91 | ################################################################ |
| 92 | # Branch B |
| 93 | # Start from O |
| 94 | |
| 95 | rm -rf [NDMASLT][NDMASLT] Z DF |
| 96 | mkdir Z |
| 97 | test_expect_success 'reading original tree and checking out' ' |
| 98 | git read-tree $tree_O && |
| 99 | git checkout-index -a |
| 100 | ' |
| 101 | |
| 102 | to_remove=$(echo ?D Z/?D) |
| 103 | rm -f $to_remove |
| 104 | test_expect_success 'change in branch B (removal)' ' |
| 105 | git update-index --remove $to_remove |
| 106 | ' |
| 107 | |
| 108 | for p in ?M Z/?M |
| 109 | do |
| 110 | echo This is modified $p in the branch B. >$p |
| 111 | test_expect_success 'change in branch B (modification)' ' |
| 112 | git update-index $p |
| 113 | ' |
| 114 | done |
| 115 | |
| 116 | for p in NA AA Z/NA Z/AA |
| 117 | do |
| 118 | echo This is added $p in the branch B. >$p |
| 119 | test_expect_success 'change in branch B (addition)' ' |
| 120 | git update-index --add $p |
| 121 | ' |
| 122 | done |
| 123 | echo This is SS from the modified tree. >SS |
| 124 | echo This is LL from the modified tree. >LL |
| 125 | test_expect_success 'change in branch B (addition and modification)' ' |
| 126 | git update-index --add LL && |
| 127 | git update-index SS |
| 128 | ' |
| 129 | mv TT TT- |
| 130 | sed -e '/Branch B/s/word/WORD/g' <TT- >TT |
| 131 | rm -f TT- |
| 132 | test_expect_success 'change in branch B (modification)' ' |
| 133 | git update-index TT |
| 134 | ' |
| 135 | |
| 136 | echo Branch B makes a file at DF. >DF |
| 137 | test_expect_success 'change in branch B (addition of a file to conflict with directory)' ' |
| 138 | git update-index --add DF |
| 139 | ' |
| 140 | |
| 141 | test_expect_success 'recording branch B tree' ' |
| 142 | tree_B=$(git write-tree) |
| 143 | ' |
| 144 | |
| 145 | test_expect_success 'keep contents of 3 trees for easy access' ' |
| 146 | rm -f .git/index && |
| 147 | git read-tree $tree_O && |
| 148 | mkdir .orig-O && |
| 149 | git checkout-index --prefix=.orig-O/ -f -q -a && |
| 150 | rm -f .git/index && |
| 151 | git read-tree $tree_A && |
| 152 | mkdir .orig-A && |
| 153 | git checkout-index --prefix=.orig-A/ -f -q -a && |
| 154 | rm -f .git/index && |
| 155 | git read-tree $tree_B && |
| 156 | mkdir .orig-B && |
| 157 | git checkout-index --prefix=.orig-B/ -f -q -a |
| 158 | ' |