6 t-dependencies NO-DGIT GDR
8 t-tstunt-parsechangelog
9 t-setup-import gdr-convert-gbp-noarchive
11 export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
13 : ----- prepare the baseline -----
17 t-gdr-prep-new-upstream 2.1
23 : ===== early failure in walk =====
25 : ----- prepare other -----
28 t-some-changes other '' -other
30 git branch other-before-new-upstream
32 t-git-debrebase new-upstream 2.1
35 : ----- prepare master -----
38 t-git-debrebase new-upstream 2.1
41 git branch master-before-merge
43 : ----- make the merge -----
45 git merge -s ours other
47 # we have to do a little dance to make this not a pseudomerge
49 dch -a 'Merge, only conflict was in debian/changelog'
51 git commit -a --amend --no-edit
53 t-expect-fail F:'divergent anchors' \
56 : ===== late failure in apply =====
59 git reset --hard other-before-new-upstream
61 echo other-upstream-confict >>docs/README
62 git commit -m 'other-upstream-conflict' docs/README
66 : ----- make the merge -----
69 git reset --hard master-before-merge
71 t-merge-conflicted-stripping-conflict-markers other docs/README
73 : ----- expect failure -----
75 t-expect-fail F:'docs/README' \
78 # xxx want to check wrecknotes appear