git-debrebase: wip stitch

[dgit.git] / tests / tests / gdr-edits

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index f5ca2a434b986106f2d2a6f1dab7f2ac94a0706f..8bfbfc61b2ddadca5c5afbc56328aff3ec840bb0 100755 (executable)
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -11,6 +11,25 @@ cd $p
 t-git-debrebase analyse |tee ../anal.1
 cat ../anal.1
 
-: xxx
+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'
+
+t-git-debrebase stitch --prose=wombat
 
 t-ok