: 'upstream hat'
-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
+t-gdr-prep-new-upstream 2.1
: 'maintainer hat'
git tag v2.1 upstream
+git branch before-new-upstream
+
+clog-check-1 () {
+ before=$1
+ date=$(git log --format=%aD -n1 debian/changelog)
+ date=$(date -R -d "$date")
+ git show $before:debian/changelog >../clog.before
+ m=" * Update to new upstream version ${v%-*}."
+ e="dgit test git user <dgit-test@debian.example.net> $date"
+}
+clog-check-2 () {
+ diff -u ../clog.expected debian/changelog
+}
+
+: ----- ordinary new upstream test -----
+
t-git-debrebase new-upstream ${v%-*}
+clog-check-1 before-new-upstream
+cat - <<END ../clog.before >../clog.expected
+example ($v) UNRELEASED; urgency=medium
+
+$m
+
+ -- $e
+
+END
+clog-check-2
+
t-gdr-good laundered
git reflog | egrep 'debrebase new-upstream.*checkout'
git branch ordinary
-: 'with --anchor'
+: ----- 'with --anchor' -----
-git reset --hard startpoint
+git checkout -b with-anchor startpoint
t-git-debrebase analyse >../anal.anch
anchor=$(perl <../anal.anch -ne '