done
git commit -m 'MIXED add boths'
+git tag t.before
+
+t-git-debrebase
+
+git diff t.before -- ':.' ':!debian/patches'
+
+: todo 'check that the branch has the expected structure'
+
+t-git-debrebase stitch --prose=wombat
+
+: todo 'check that all is still well'
+
+: 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