set -e
. tests/lib
-t-dependencies git-buildpackage libfile-fnmatch-perl faketime
+t-dependencies NO-DGIT GDR
-t-setup-import gdr-convert-gbp
+t-setup-import gdr-convert-gbp-noarchive
cd $p
new-upstream () {
uv=$1
+ t-git-next-date
git checkout make-upstream
git reset --hard upstream
t-make-new-upstream-tarball $uv
git push . make-upstream:upstream
git checkout master
+ t-git-next-date
}
new-upstream 2.1
: 'maintainer hat'
+git branch startpoint
+v=2.1-1
+
git checkout master
-v=2.1-1
+t-expect-fail F:'Could not determine appropriate upstream commitish' \
+t-git-debrebase new-upstream-v0 $v
+
+git tag v2.1 upstream
+
+t-git-debrebase new-upstream-v0 $v
+t-gdr-good laundered
+
+t-git-debrebase stitch
+t-gdr-good stitched
+
+git branch ordinary
+
+: 'with --anchor'
-t-git-debrebase new-upstream-v0 $v upstream
+git reset --hard startpoint
+
+t-git-debrebase analyse >../anal.anch
+anchor=$(perl <../anal.anch -ne '
+ next unless m/^(\w+) Anchor\s/;
+ print $1,"\n";
+ exit;
+')
+
+t-git-debrebase --anchor=$anchor -fanchor-treated new-upstream-v0 $v upstream
t-gdr-good laundered
t-git-debrebase stitch
t-gdr-good stitched
+git diff --quiet ordinary
+
t-ok