Keep the patch log when import --replace deletes patches
[stgit.git] / t / t2102-pull-policy-rebase.sh
blobce2e32f91b1a18cf6b533b12ac9094966144b0c3
1 #!/bin/sh
3 # Copyright (c) 2007 Yann Dirson
6 test_description='Excercise pull-policy "rebase".'
8 . ./test-lib.sh
10 test_expect_success \
11 'Fork stack off parent branch, and add patches to the stack' \
13 git branch -m master parent &&
14 stg init &&
15 stg branch --create stack &&
16 git repo-config branch.stack.stgit.pull-policy rebase &&
17 git repo-config --list &&
18 stg new c1 -m c1 &&
19 echo a > file && stg add file && stg refresh
22 test_expect_success \
23 'Add non-rewinding commit in parent and pull the stack' \
25 stg branch parent && stg new u1 -m u1 &&
26 echo b > file2 && stg add file2 && stg refresh &&
27 stg branch stack && stg pull &&
28 test -e file2
31 test_expect_success \
32 'Rewind/rewrite commit in parent and pull the stack' \
34 stg branch parent && echo b >> file2 && stg refresh &&
35 stg branch stack && stg pull &&
36 test `wc -l <file2` = 2
39 test_done