git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
- local etype netype
+ local etype netype bwtip
case $state in
- laundered) etype=Upstream ;;
+ laundered)
+ etype=Upstream
+ bwtip=Y:`t-git-debrebase breakwater`
+ ;;
stitched) etype=Pseudomerge ;;
pushed) etype=AddPatches; netype=Pseudomerge ;;
esac
expect="$parents"
enparents=1
: "$ctype/$cetype" "$parents"
+
case "$ctype/$cetype" in
Pseudomerge/SAME) ;;
Packaging/SAME) ;;
;;
esac
+ case "$ctype/$etype" in
+ Packaging/Upstream|\
+ Changelog/Upstream)
+ if [ "x$bwtip" != x ]; then
+ test "$bwtip" = "Y:$cid"
+ bwtip=''
+ fi
+ esac
+
case "$ctype" in
Pseudomerge)
expect=${info#Contributor=}
t-some-changes () {
local token=$1
+ t-git-next-date
+
echo >>debian/zorkmid "// debian $token"
git add debian/zorkmid
git commit -m "DEBIAN add zorkmid ($token)"
git add $f
done
git commit -m "MIXED add both ($token)"
+
+ t-git-next-date
}
t-make-new-upstream-tarball () {