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
14 junkref=refs/debrebase-wreckage/junk
15 git update-ref $junkref v2.1
19 test '' = "$(t-git-get-ref-exact $junkref)"
20 git for-each-ref refs/debrebase-wreckage | egrep .
23 : ----- prepare the baseline -----
27 t-gdr-prep-new-upstream 2.1
33 : ===== early failure in walk =====
35 : ----- prepare other -----
38 t-some-changes other '' -other
40 git branch other-before-new-upstream
42 t-git-debrebase new-upstream 2.1
45 : ----- prepare master -----
48 t-git-debrebase new-upstream 2.1
51 git branch master-before-merge
53 : ----- make the merge -----
55 git merge -s ours other
57 # we have to do a little dance to make this not a pseudomerge
59 dch -a 'Merge, only conflict was in debian/changelog'
61 git commit -a --amend --no-edit
65 t-expect-fail F:'divergent anchors' \
70 : ===== late failure in apply =====
73 git reset --hard other-before-new-upstream
75 echo other-upstream-confict >>docs/README
76 git commit -m 'other-upstream-conflict' docs/README
80 if git for-each-ref refs/debrebase-wreckage | egrep .; then fail wreck; fi
82 : ----- make the merge -----
85 git reset --hard master-before-merge
87 t-merge-conflicted-stripping-conflict-markers other docs/README
89 : ----- expect failure -----
93 t-expect-fail F:'docs/README' \