3 # Copyright (c) 2007 Yann Dirson
6 test_description
='Excercise pull-policy "rebase".'
11 'Fork stack off parent branch, and add patches to the stack' \
13 git branch -m master parent &&
15 stg branch --create stack &&
16 git repo-config branch.stack.stgit.pull-policy rebase &&
17 git repo-config --list &&
19 echo a > file && stg add file && stg refresh
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 &&
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