cd $p
+v=2.0-3
+t-dch-commit -v $v -m testing
+
t-git-debrebase analyse |tee ../anal.1
cat ../anal.1
-echo >>debian/zorkmid '// debian'
-git add debian/zorkmid
-git commit -m 'DEBIAN add zorkmid'
-
-echo >>src.c '// upstream'
-git commit -a -m 'UPSTREAM edit src.c'
+t-some-changes edits
-for f in debian/zorkmid src.c; do
- echo '// both!' >>$f
- git add $f
-done
-git commit -m 'MIXED add boths'
+t-dch-commit -r sid
git tag t.before
git diff t.before -- ':.' ':!debian/patches'
+t-gdr-branch-structure laundered
+
t-git-debrebase stitch --prose=wombat
+t-gdr-branch-structure stitched
+
+t-dgit push-source
+
+t-gdr-branch-structure pushed
+
+: todo 'more tests: convert dgit import new upstream version'
+: todo 'more tests: convert dgit import same upstream version'
+: todo 'more tests: other maint updated, we must fetch'
+: todo 'more tests: other maint updated, alert divergence'
+: todo 'more tests: nmu divergence'
+
t-ok