From 6206349cffcc47da7d927aeec058e579654d2075 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 13 Jun 2015 18:08:24 +0100
Subject: Test suite: Provide t-prep-mergechangelogs and use it in
 debpolicy-newreject

---
 tests/lib                       | 9 +++++++++
 tests/tests/debpolicy-newreject | 1 +
 2 files changed, 10 insertions(+)

(limited to 'tests')

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`
diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index 0400c08..765c4d2 100755
--- 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
-- 
cgit v1.2.3