6 t-dependencies NO-DGIT GDR
8 t-tstunt-parsechangelog
9 t-setup-import gdr-convert-gbp-noarchive
15 t-gdr-prep-new-upstream 2.1
22 t-some-changes other '' -other
25 echo other-upstream-confict >>docs/README
26 git commit -m 'other-upstream-conflict' docs/README
31 t-git-debrebase new-upstream 2.1
33 t-merge-conflicted-stripping-conflict-markers other docs/README
35 export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
37 t-expect-fail F:'docs/README' \
40 # xxx want to test a nomerge from first walk analysis half
41 # xxx want to check wrecknotes appear