t/t9202-merge-on-dirty.sh

   1 #!/usr/bin/env bash
   2 #
   3 # Copyright (c) 2005 Petr Baudis
   4 #
   5 test_description="Tests cg-merge done on a tree with local modifications
   6
   7 Under certain conditions, cg-merge can be done even on a tree with local
   8 modifications. This test should ensure that no local changes are lost, while
   9 they also shan't interfere with the committed merge."
  10
  11 . ./test-lib.sh
  12
  13 # branch1 -> branch2
  14
  15 test_add_block()
  16 {
  17         test_expect_success 'local change on branch1 (add, should block)' \
  18                         "(cd branch1 && echo boo >y && cg-add y)"
  19         cp branch1/y branch1/y-
  20         test_expect_failure "merging branch2 to branch1 ($1)" \
  21                         "(cd branch1 && cg-merge </dev/null)"
  22         test_expect_success 'checking if we still have our local change' \
  23                         '(cd branch1 && cg-status -w | grep -q "^A y" && cmp y y-)'
  24         test_expect_success 'undoing the local change' \
  25                         '(cd branch1 && cg-rm -f y)'
  26         test_expect_success 'confirming that we have no uncommitted modifications' \
  27                         '(cd branch1 && [ -z "$(git-diff-index -r $(cg-object-id -t))" ])'
  28 }
  29
  30 commit_and_propagate()
  31 {
  32         test_expect_success 'local commit in branch2' \
  33                         "(cd branch2 && cg-commit -m\"Some commit\")"
  34         test_expect_success 'fetching from branch2 to branch1' \
  35                         "(cd branch1 && cg-fetch)"
  36 }
  37
  38 mkdir branch1
  39 # The blank space is to prevent conflicts for automatic merges.
  40 cat >branch1/brm <<__END__
  41 blah
  42
  43
  44
  45
  46
  47
  48
  49
  50
  51
  52 boo
  53 __END__
  54
  55 >branch1/foo
  56 >branch1/bar
  57
  58 test_expect_success 'initialize branch1' \
  59         "(cd branch1 && cg-init -I && cg-add brm foo bar && cg-commit -C -m\"Initial commit\")"
  60 test_expect_success 'fork branch2' \
  61         "cg-clone branch1 branch2"
  62 test_expect_success 'registering branch2 in branch1' \
  63         "(cd branch1 && cg-branch-add origin ../branch2)"
  64
  65 echo appended >>branch2/foo
  66 commit_and_propagate
  67
  68 test_expect_success 'local change on branch1 (should not block)' \
  69                 "(cd branch1 && echo boo >x && cg-add x)"
  70 cp branch1/x branch1/x-
  71 test_expect_success 'merging branch2 to branch1 (fast-forward)' \
  72                 "(cd branch1 && cg-merge </dev/null)"
  73 test_expect_success 'checking if we still have our local change' \
  74                 '(cd branch1 && cg-status -w | grep -q "^A x" && cmp x x-)'
  75
  76
  77 test_expect_success 'local commit in branch1' \
  78                 "(cd branch1 && cg-commit -m\"Branch1 commit\")"
  79
  80
  81 echo appended >>branch2/foo
  82 commit_and_propagate
  83
  84 test_add_block "clean"
  85
  86 test_expect_success 'local change on branch1 (modify in same, should block)' \
  87                 "(cd branch1 && echo appended-too >>foo)"
  88 cp branch1/foo branch1/foo-
  89 test_expect_failure 'merging branch2 to branch1 (clean)' \
  90                 "(cd branch1 && cg-merge </dev/null)"
  91 test_expect_success 'checking if we still have our local change' \
  92                 '(cd branch1 && cg-status -w | grep -q "^M foo" && cmp foo foo-)'
  93 # This test is useful if the previous one failed - did it get lost or
  94 # accidentally committed?
  95 test_expect_success 'checking that we didn'\''t commit the local change' \
  96                 '(cd branch1 && cg-admin-cat foo >foo-tree && ! cmp foo- foo-tree)'
  97 test_expect_success 'undoing the local change' \
  98                 '(cd branch1 && cg-restore -f foo)'
  99 test_expect_success 'confirming that we have no uncommitted modifications' \
 100                 '(cd branch1 && [ -z "$(git-diff-index -r $(cg-object-id -t))" ])'
 101
 102 test_expect_success 'local change on branch1 (modify in different, should not block)' \
 103                 "(cd branch1 && echo moo >bar)"
 104 cp branch1/bar branch1/bar-
 105 test_expect_success 'merging branch2 to branch1 (clean)' \
 106                 "(cd branch1 && cg-merge </dev/null)"
 107 test_expect_success 'checking if we still have our local change' \
 108                 '(cd branch1 && cg-status -w | grep -q "^M bar" && cmp bar bar-)'
 109 # This test is useful if the previous one failed - did it get lost or
 110 # accidentally committed?
 111 test_expect_success 'checking that we didn'\''t commit the local change' \
 112                 '(cd branch1 && cg-admin-cat bar >bar-tree && ! cmp bar- bar-tree)'
 113
 114
 115 mv branch1/brm branch1/brm-old
 116 echo prepended >branch1/brm
 117 cat branch1/brm-old >>branch1/brm
 118 rm branch1/brm-old
 119 test_expect_success 'local commit in branch1' \
 120                 "(cd branch1 && cg-commit -m\"Branch1 commit\")"
 121
 122
 123 echo appended2 >>branch2/brm
 124 commit_and_propagate
 125
 126 test_add_block "automatic"
 127
 128 test_expect_success 'local change on branch1 (modify in different, should not block)' \
 129                 "(cd branch1 && echo poo >bar)"
 130 cp branch1/bar branch1/bar-
 131 cp branch1/brm branch1/brm-
 132 test_expect_success 'merging branch2 to branch1 (automatic)' \
 133                 "(cd branch1 && cg-merge </dev/null)"
 134 test_expect_success 'checking if the working copy was touched by the merge' \
 135                 '(cd branch1 && ! cmp brm brm-)'
 136 test_expect_success 'checking if we still have our local change' \
 137                 '(cd branch1 && cg-status -w | grep -q "^M bar" && cmp bar bar-)'
 138 # This test is useful if the previous one failed - did it get lost or
 139 # accidentally committed?
 140 test_expect_success 'checking that we didn'\''t commit the local change' \
 141                 '(cd branch1 && cg-admin-cat bar >bar-tree && ! cmp bar- bar-tree)'
 142
 143
 144 echo conflicting >>branch1/brm
 145 test_expect_success 'local commit in branch1' \
 146                 "(cd branch1 && cg-commit -m\"Branch1 commit\")"
 147
 148
 149 # Theoretically the following commit should be superfluous, but we would get
 150 # false successful merge if the previous test failed and merge succeeded.
 151
 152 echo appended3 >>branch2/brm
 153 commit_and_propagate
 154
 155 test_add_block "conflicting"
 156
 157 test_expect_success 'local change on branch1 (modify in different, should not block)' \
 158                 "(cd branch1 && echo zoo >bar)"
 159 cp branch1/bar branch1/bar-
 160 cp branch1/brm branch1/brm-
 161 test_expect_failure 'merging branch2 to branch1 (conflicting)' \
 162                 "(cd branch1 && cg-merge </dev/null)"
 163 test_expect_success 'checking if the merge caused a conflict' \
 164                 '(cd branch1 && grep "<<<" brm)'
 165 # <now imagine me resolving the conflict>
 166 test_expect_success 'checking if we still have our local change' \
 167                 '(cd branch1 && cg-status -w | grep -q "^m bar" && cmp bar bar-)'
 168 test_expect_success 'committing "resolved" conflicting merge' \
 169                 '(cd branch1 && cg-commit -m"Resolved conflicting merge")'
 170 test_expect_success 'checking if we still have our local change' \
 171                 '(cd branch1 && cg-status -w | grep -q "^M bar" && cmp bar bar-)'
 172 # This test is useful if the previous one failed - did it get lost or
 173 # accidentally committed?
 174 test_expect_success 'checking that we didn'\''t commit the local change' \
 175                 '(cd branch1 && cg-admin-cat bar >bar-tree && ! cmp bar- bar-tree)'
 176
 177
 178 test_done