# stitched
# patches
+ local etype netype
+
case $state in
laundered) etype=Upstream ;;
stitched) etype=Pseudomerge ;;
- patches) etype=XXX-TODO ;;
+ pushed) etype=AddPatches; netype=Pseudomerge ;;
esac
t-git-debrebase analyse >../anal.check
git diff --quiet $expect..$cid -- ':debian/patches'
etype=Packaging
;;
+ AddPatches/SAME)
+ git diff --quiet $expect..$cid -- \
+ ':.' ':!debian/patches'
+ etype=$netype
+ netype=Upstream
+ ;;
Changelog/Packaging|\
Changelog/Upstream)
git diff --quiet $expect..$cid -- \
done
}
+
+t-some-changes () {
+ local token=$1
+
+ echo >>debian/zorkmid "// debian $token"
+ git add debian/zorkmid
+ git commit -m "DEBIAN add zorkmid ($token)"
+
+ echo >>src.c "// upstream $token"
+ git commit -a -m "UPSTREAM edit src.c ($token)"
+
+ for f in debian/zorkmid src.c; do
+ echo "// both! $token" >>$f
+ git add $f
+ done
+ git commit -m "MIXED add both ($token)"
+}