From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 4 Jul 2015 21:11:09 +0000 (+0100)
Subject: Test suite: Use "dgit setup-mergechangelogs" and abolish t-prep-mergechangelogs
X-Git-Tag: debian/0.30~11
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=076a8ac565082e73b3bae409df4492701654d74a;hp=4afda6c62b97cdb6e3097dc9f5703aa65f5124d8

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

diff --git a/tests/lib b/tests/lib
index 9fc056e6..fbe04b7d 100644
--- 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 6987ef3a..8bc0c860 100755
--- 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