From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 13 Jun 2015 17:08:24 +0000 (+0100)
Subject: Test suite: Provide t-prep-mergechangelogs and use it in debpolicy-newreject
X-Git-Tag: debian/0.30~88
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=6206349cffcc47da7d927aeec058e579654d2075;hp=0fa7c72bc9664d8ebc2e8eb4d3a2bafc03eb2f6d

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

diff --git a/tests/lib b/tests/lib
index 5b93d98d..e1bc6d94 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 0400c083..765c4d26 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