: '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
+
t-git-debrebase new-upstream ${v%-*}
+date=$(git log --format=%aD -n1 debian/changelog)
+cat >../clog.expected <<END
+example ($v) UNRELEASED; urgency=medium
+
+ * Update to new upstream version ${v%-*}.
+
+ -- dgit test git user <dgit-test@debian.example.net> $date
+
+END
+git show before-new-upstream:debian/changelog >>../clog.expected
+diff -u ../clog.expected debian/changelog
+
t-gdr-good laundered
git reflog | egrep 'debrebase new-upstream.*checkout'