git-debrebase: test suite: introduce t-some-changes

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

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index 5388f0498bb5045a82ae638def762f65f24cd2c5..cff33b1d1e791506ac209d2078fbab081d06f570 100755 (executable)
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -9,27 +9,14 @@ t-setup-import gbp2gdr
 cd $p
 
 v=2.0-3
-dch -v $v -m testing
-git commit -m changelog debian/changelog
+t-dch-commit -v $v -m testing
 
 t-git-debrebase analyse |tee ../anal.1
 cat ../anal.1
 
-echo >>debian/zorkmid '// debian'
-git add debian/zorkmid
-git commit -m 'DEBIAN add zorkmid'
+t-some-changes edits
 
-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'
-
-dch -r sid
-git commit -m changelog debian/changelog
+t-dch-commit -r sid
 
 git tag t.before
 
@@ -45,6 +32,8 @@ 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'