X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=inline;f=tests%2Ftests%2Fgdr-edits;h=ddb354d8f870036425f70554a4a3fedf12a6372c;hb=e16b3c810bb906b8a66ffdb41e96d3912704d3f4;hp=1d74da3b54d1961983bdd06322cead0ebd6ae420;hpb=237fe933713ea3d86ed8fbdb86819797b770405b;p=dgit.git diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits index 1d74da3b..ddb354d8 100755 --- a/tests/tests/gdr-edits +++ b/tests/tests/gdr-edits @@ -24,4 +24,22 @@ for f in debian/zorkmid src.c; do 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