X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-edits;h=30786fee76f8d2245a630538d0b0faeceb5be8fd;hb=4dea77665732625beb1e7b8be5f459dd3b4c7fd7;hp=bab3a3dce67477eae5dd5f580c6c6ae199a70e40;hpb=a978592a6db863d539e0ec66c2a6b5fd9d59e96b;p=dgit.git

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index bab3a3dc..30786fee 100755
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -8,6 +8,10 @@ t-setup-import gbp2gdr
 
 cd $p
 
+v=2.0-3
+dch -v $v -m testing
+git commit -m changelog debian/changelog
+
 t-git-debrebase analyse |tee ../anal.1
 cat ../anal.1
 
@@ -24,10 +28,29 @@ for f in debian/zorkmid src.c; do
 done
 git commit -m 'MIXED add boths'
 
+dch -r sid
+git commit -m changelog debian/changelog
+
 git tag t.before
 
 t-git-debrebase
 
 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