local gdr=${DGIT_GITDEBREBASE_TEST-git-debrebase}
: '
{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
- $gdr $GDR_TEST_OPTS $GDR_TEST_DEBUG $t_gdr_xopts "$@"
+ $gdr "--dgit=${DGIT_TEST-dgit}" $GDR_TEST_OPTS \
+ $GDR_TEST_DEBUG $t_gdr_xopts "$@"
: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
'
}
;;
stitched) etypes=Pseudomerge-Upstream ;;
pushed) etypes=AddPatches-Pseudomerge-Upstream ;;
+ pushed-interop) etypes=Pseudomerge-AddPatchesInterop-Upstream ;;
esac
t-git-debrebase analyse >../anal.check
Packaging/SAME) ;;
Packaging/Upstream) ;;
AddPatches/SAME) ;;
+ AddPatches/AddPatchesInterop) ;;
Changelog/Packaging) ;;
Changelog/Upstream) ;;
Upstream/SAME) ;;
fi
esac
+ case "$cetype" in
+ AddPatchesInterop)
+ git log -n1 --pretty=format:%B \
+ | grep '^\[git-debrebase[ :]'
+ ;;
+ esac
+
case "$ctype" in
Pseudomerge)
expect=${info#Contributor=}
test $cnparents = $enparents
local cndparents=`
- for f in $parents; do echo $f; done | sort -u | wc -w
+ for f in $parents; do echo $f; done | t-sort -u | wc -w
`
test $cndparents = $cnparents
t-some-changes () {
local token=$1
+ local which=${2:-dum}
+ local fsuffix=$3
t-git-next-date
- echo >>debian/zorkmid "// debian $token"
- git add debian/zorkmid
- git commit -m "DEBIAN add zorkmid ($token)"
+ case "$which" in
+ *d*)
+ echo >>debian/zorkmid$fsuffix "// debian $token"
+ git add debian/zorkmid$fsuffix
+ git commit -m "DEBIAN add zorkmid$fsuffix ($token)"
+ ;;
+ esac
- echo >>src.c "// upstream $token"
- git commit -a -m "UPSTREAM edit src.c ($token)"
+ case "$which" in
+ *u*)
+ echo >>src$fsuffix.c "// upstream $token"
+ git add src$fsuffix.c
+ git commit -m "UPSTREAM edit src$fsuffix.c ($token)"
+ ;;
+ esac
- for f in debian/zorkmid src.c; do
- echo "// both! $token" >>$f
- git add $f
- done
- git commit -m "MIXED add both ($token)"
+ case "$which" in
+ *m*)
+ for f in debian/zorkmid$fsuffix src$fsuffix.c; do
+ echo "// both! $token" >>$f
+ git add $f
+ done
+ git commit -m "MIXED add both($fsuffix) ($token)"
+ ;;
+ esac
t-git-next-date
}
}
t-nmu-upload-3 () {
- t-dch-commit -r sid
+ t-dch-commit-r
t-dgit -wgf build-source
git checkout master
t-dgit -wgf quilt-fixup
}
+
+t-gdr-prep-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
+}