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

1 files changed, 9 insertions, 0 deletions

diff --git a/tests/lib b/tests/lib
index 5b93d98..e1bc6d9 100644
--- 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`