t / t6020-merge-df.shon commit Merge branch 'jn/fast-import-fix' (ed8298d)
   1#!/bin/sh
   2#
   3# Copyright (c) 2005 Fredrik Kuivinen
   4#
   5
   6test_description='Test merge with directory/file conflicts'
   7. ./test-lib.sh
   8
   9test_expect_success 'prepare repository' \
  10'echo "Hello" > init &&
  11git add init &&
  12git commit -m "Initial commit" &&
  13git branch B &&
  14mkdir dir &&
  15echo "foo" > dir/foo &&
  16git add dir/foo &&
  17git commit -m "File: dir/foo" &&
  18git checkout B &&
  19echo "file dir" > dir &&
  20git add dir &&
  21git commit -m "File: dir"'
  22
  23test_expect_success 'Merge with d/f conflicts' '
  24        test_expect_code 1 git merge "merge msg" B master
  25'
  26
  27test_expect_success 'F/D conflict' '
  28        git reset --hard &&
  29        git checkout master &&
  30        rm .git/index &&
  31
  32        mkdir before &&
  33        echo FILE >before/one &&
  34        echo FILE >after &&
  35        git add . &&
  36        git commit -m first &&
  37
  38        rm -f after &&
  39        git mv before after &&
  40        git commit -m move &&
  41
  42        git checkout -b para HEAD^ &&
  43        echo COMPLETELY ANOTHER FILE >another &&
  44        git add . &&
  45        git commit -m para &&
  46
  47        git merge master
  48'
  49
  50test_done