Test suite: Use "dgit setup-mergechangelogs" and abolish t-prep-mergechangelogs

diff --git a/tests/lib b/tests/lib
index 9fc056e6d12455f321e53cc610f1b3aef54fed02..fbe04b7d8d91a9c63728411a4f1431dfccf70261 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -456,15 +456,6 @@ t-tstunt-parsechangelog () {
        t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm
 }
 
-t-prep-mergechangelogs () {
-       local b=merge.dpkg-mergechangelogs
-       git config $b.name 'debian/changelog merge driver'
-       git config $b.driver 'dpkg-mergechangelogs -m %O %A %B %A'
-       mkdir -p .git/info
-       echo >>.git/info/attributes \
-               'debian/changelog merge=dpkg-mergechangelogs'
-}
-
 t-ref-dsc-dgit () {
        local dsc=${p}_${v}.dsc
        local val=`t-822-field $tmp/incoming/$dsc Dgit`

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index 6987ef3a364aab532e869cd4c7343d20f70d4d1d..8bc0c8601a81eb42895cfaa1c6b5ed8908dc1f13 100755 (executable)
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -10,7 +10,7 @@ t-prep-newpackage example 1.0
 cd $p
 revision=1
 git tag start
-t-prep-mergechangelogs
+t-dgit setup-mergechangelogs
 
 echo FORBIDDEN >debian/some-file
 git add debian/some-file