Andrew's git - gitweb.git/blob

d18f8cbcf4ebc328b4c8d761735f479a7d27d0ed
   1#!/bin/sh
   2#
   3# Copyright (c) 2005 Junio C Hamano
   4#
   5
   6test_description='Three way merge with read-tree -m
   7
   8This test tries three-way merge with read-tree -m
   9
  10There is one ancestor (called O for Original) and two branches A
  11and B derived from it.  We want to do a 3-way merge between A and
  12B, using O as the common ancestor.
  13
  14    merge A O B
  15
  16Decisions are made by comparing contents of O, A and B pathname
  17by pathname.  The result is determined by the following guiding
  18principle:
  19
  20 - If only A does something to it and B does not touch it, take
  21   whatever A does.
  22
  23 - If only B does something to it and A does not touch it, take
  24   whatever B does.
  25
  26 - If both A and B does something but in the same way, take
  27   whatever they do.
  28
  29 - If A and B does something but different things, we need a
  30   3-way merge:
  31
  32   - We cannot do anything about the following cases:
  33
  34     * O does not have it.  A and B both must be adding to the
  35       same path independently.
  36
  37     * A deletes it.  B must be modifying.
  38
  39   - Otherwise, A and B are modifying.  Run 3-way merge.
  40
  41First, the case matrix.
  42
  43 - Vertical axis is for A'\''s actions.
  44 - Horizontal axis is for B'\''s actions.
  45
  46.----------------------------------------------------------------.
  47| A        B | No Action  |   Delete   |   Modify   |    Add     |
  48|------------+------------+------------+------------+------------|
  49| No Action  |            |            |            |            |
  50|            | select O   | delete     | select B   | select B   |
  51|            |            |            |            |            |
  52|------------+------------+------------+------------+------------|
  53| Delete     |            |            | ********** |    can     |
  54|            | delete     | delete     | merge      |    not     |
  55|            |            |            |            |  happen    |
  56|------------+------------+------------+------------+------------|
  57| Modify     |            | ********** | ?????????? |    can     |
  58|            | select A   | merge      | select A=B |    not     |
  59|            |            |            | merge      |  happen    |
  60|------------+------------+------------+------------+------------|
  61| Add        |            |    can     |    can     | ?????????? |
  62|            | select A   |    not     |    not     | select A=B |
  63|            |            |  happen    |  happen    | merge      |
  64.----------------------------------------------------------------.
  65
  66In addition:
  67
  68 SS: a special case of MM, where A and B makes the same modification.
  69 LL: a special case of AA, where A and B creates the same file.
  70 TT: a special case of MM, where A and B makes mergeable changes.
  71 DF: a special case, where A makes a directory and B makes a file.
  72
  73'
  74. ./test-lib.sh
  75. ../lib-read-tree-m-3way.sh
  76
  77################################################################
  78# Try merging and showing the various diffs
  79
  80cat >expected <<\EOF
  81100644 X 2      AA
  82100644 X 3      AA
  83100644 X 2      AN
  84100644 X 1      DD
  85100644 X 3      DF
  86100644 X 2      DF/DF
  87100644 X 1      DM
  88100644 X 3      DM
  89100644 X 1      DN
  90100644 X 3      DN
  91100644 X 2      LL
  92100644 X 3      LL
  93100644 X 1      MD
  94100644 X 2      MD
  95100644 X 1      MM
  96100644 X 2      MM
  97100644 X 3      MM
  98100644 X 0      MN
  99100644 X 3      NA
 100100644 X 1      ND
 101100644 X 2      ND
 102100644 X 0      NM
 103100644 X 0      NN
 104100644 X 0      SS
 105100644 X 1      TT
 106100644 X 2      TT
 107100644 X 3      TT
 108100644 X 2      Z/AA
 109100644 X 3      Z/AA
 110100644 X 2      Z/AN
 111100644 X 1      Z/DD
 112100644 X 1      Z/DM
 113100644 X 3      Z/DM
 114100644 X 1      Z/DN
 115100644 X 3      Z/DN
 116100644 X 1      Z/MD
 117100644 X 2      Z/MD
 118100644 X 1      Z/MM
 119100644 X 2      Z/MM
 120100644 X 3      Z/MM
 121100644 X 0      Z/MN
 122100644 X 3      Z/NA
 123100644 X 1      Z/ND
 124100644 X 2      Z/ND
 125100644 X 0      Z/NM
 126100644 X 0      Z/NN
 127EOF
 128
 129_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
 130_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
 131
 132# The tree is dirty at this point.
 133test_expect_failure \
 134    '3-way merge with git-read-tree -m, dirty cache' \
 135    "git-read-tree -m $tree_O $tree_A $tree_B"
 136
 137# This is done on an empty work directory, which is the normal
 138# merge person behaviour.
 139test_expect_success \
 140    '3-way merge with git-read-tree -m, empty cache' \
 141    "rm -fr [NDMALTS][NDMALTSF] Z &&
 142     rm .git/index &&
 143     git-read-tree -m $tree_O $tree_A $tree_B &&
 144     git-ls-files --stage |
 145     sed -e 's/ $_x40 / X /' >current &&
 146     diff -u expected current"
 147
 148# This starts out with the first head, which is the normal
 149# patch submitter behaviour.
 150test_expect_success \
 151    '3-way merge with git-read-tree -m, match H' \
 152    "git-read-tree $tree_A &&
 153     git-checkout-cache -f -u -a &&
 154     git-read-tree -m $tree_O $tree_A $tree_B &&
 155     git-ls-files --stage |
 156     sed -e 's/ $_x40 / X /' >current &&
 157     diff -u expected current"
 158
 159test_done