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
43 echo 'other-conflict' >>debian/zorkmid
44 git commit -m 'other-conflict' debian/zorkmid
47 t-some-changes us-1 '' -us
48 t-git-debrebase new-upstream 2.1
49 t-some-changes us-2 '' -us
50 echo 'us-conflict' >>debian/zorkmid
51 git commit -m 'us-conflict' debian/zorkmid
54 t-expect-fail E:'Merge conflict in debian/zorkmid' \
57 perl -i~ -ne 'print unless m{^(?:\<\<\<|\>\>\>|===)}' debian/zorkmid
59 git add debian/zorkmid
62 t-expect-fail E:'general two-parent merge' \
65 export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1