#!/bin/bash set -e . tests/lib t-dependencies git-buildpackage libfile-fnmatch-perl t-setup-import gbp2gdr cd $p 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' for f in debian/zorkmid src.c; do echo '// both!' >>$f git add $f 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