6 t-dependencies NO-DGIT GDR
8 t-tstunt-parsechangelog
9 t-setup-import gdr-convert-gbp-noarchive
11 : 'set up so t-git-debrebase runs gdr via git'
13 case "$DGIT_GITDEBREBASE_TEST" in
17 st=$tmp/tstunt/git-debrebase
18 export DGIT_GITDEBREBASE_TEST_REAL="$DGIT_GITDEBREBASE_TEST"
22 exec "$DGIT_GITDEBREBASE_TEST_REAL" "$@"
28 DGIT_GITDEBREBASE_TEST='git debrebase'
34 t-gdr-prep-new-upstream 2.1
41 t-some-changes other '' -other
44 t-some-changes us-1 '' -us
45 t-git-debrebase new-upstream 2.1
46 t-some-changes us-2 '' -us
52 # xxx ^ commenting out this line produces an internal error
54 t-expect-fail E:'general two-parent merge' \
57 export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
61 # xxx want to check that we DTRT if we start out unstitched -
62 # xxx should consider our ffq-prev as a parent
63 # xxx or should we ? it's not a parent of the merge is it ?
64 # xxx => user should prefer to make merges when stitched ?
65 # xxx think about this later
67 # t-gdr-good laundered
68 # xxx ^ this does not work