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 .
24 if git for-each-ref refs/debrebase/wreckage | egrep .; then
29 : ----- prepare the baseline -----
33 t-gdr-prep-new-upstream 2.1
39 : ===== early failure in walk =====
41 : ----- prepare other -----
44 t-some-changes other '' -other
46 git branch other-before-new-upstream
48 t-git-debrebase new-upstream 2.1
51 : ----- prepare master -----
54 t-git-debrebase new-upstream 2.1
57 git branch master-before-merge
59 : ----- make the merge -----
61 git merge -s ours other
63 # we have to do a little dance to make this not a pseudomerge
65 dch -a 'Merge, only conflict was in debian/changelog'
67 git commit -a --amend --no-edit
71 t-expect-fail F:'divergent anchors' \
76 : ===== late failure in apply =====
79 git reset --hard other-before-new-upstream
81 echo other-upstream-confict >>docs/README
82 git commit -m 'other-upstream-conflict' docs/README
88 : ----- make the merge -----
91 git reset --hard master-before-merge
93 t-merge-conflicted-stripping-conflict-markers other docs/README
94 t-git-debrebase stitch
96 : ----- expect failure -----
100 t-expect-fail F:'docs/README' \
105 : ===== resolve the conflict =====
109 quilt_faff_before () {
110 git checkout -b fix$1 debrebase/wreckage/merged-patchqueue
111 QUILT_PATCHES=debian/patches quilt push -a
113 quilt_faff_after () {
114 QUILT_PATCHES=debian/patches quilt refresh
115 git add debian/patches
119 t-git-debrebase record-resolved-merge
128 t-expect-fail E:'upstream files are not the same' \
131 t-git-debrebase scrap
136 t-expect-fail F:'docs/README' \
141 git checkout master docs/README
142 git reset docs/README