t/t2202-rebase-conflict.sh

   1 #!/bin/sh
   2
   3 test_description='Test the "rebase" command with conflicts.'
   4
   5 . ./test-lib.sh
   6
   7 test_expect_success \
   8         'Setup master' \
   9         '
  10         echo foo > file1 &&
  11         git add file1 &&
  12         git commit -m a
  13         '
  14
  15 test_expect_success \
  16         'Setup stack branch' \
  17         '
  18         stg branch --create stack &&
  19         stg new p -m . &&
  20         echo bar >> file1 &&
  21         stg refresh
  22         '
  23
  24 test_expect_success \
  25         'Add commits to master' \
  26         '
  27         stg branch master &&
  28         echo baz >> file1 &&
  29         git add file1 &&
  30         git commit -m b
  31         '
  32
  33 test_expect_success \
  34         'Rebase stack to master' \
  35         '
  36         stg branch stack &&
  37         conflict stg rebase master &&
  38         test "$(stg series --applied -c)" = "1"
  39         '
  40
  41 test_done