Test suite: Provide t-prep-mergechangelogs and use it in debpolicy-newreject

diff --git a/tests/lib b/tests/lib
index 5b93d98dc86b074d71080106cf9ca35a8ec43e9c..e1bc6d941e8f66b60f1d4d5d1d089049e6da4bcc 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -423,6 +423,15 @@ 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 0400c0835c6a16da80b20035963366cd21383c5b..765c4d26b4407d747122a258430424f12bd68da8 100755 (executable)
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -10,6 +10,7 @@ t-prep-newpackage example 1.0
 cd $p
 revision=1
 git tag start
+t-prep-mergechangelogs
 
 echo FORBIDDEN >debian/some-file
 git add debian/some-file