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 junkref=refs/debrebase-wreckage/junk
54 git update-ref $junkref v2.1
56 t-expect-fail F:'divergent anchors' \
57 t-git-debrebase --save-wreckage
59 test '' = "$(t-git-get-ref-exact $junkref)"
61 git for-each-ref refs/debrebase-wreckage | egrep .
63 : ===== late failure in apply =====
66 git reset --hard other-before-new-upstream
68 echo other-upstream-confict >>docs/README
69 git commit -m 'other-upstream-conflict' docs/README
73 if git for-each-ref refs/debrebase-wreckage | egrep .; then fail wreck; fi
75 : ----- make the merge -----
78 git reset --hard master-before-merge
80 t-merge-conflicted-stripping-conflict-markers other docs/README
82 : ----- expect failure -----
84 t-expect-fail F:'docs/README' \
87 # xxx want to check wrecknotes appear