chiark / gitweb /
Test suite: Provide t-prep-mergechangelogs and use it in debpolicy-newreject
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 13 Jun 2015 17:08:24 +0000 (18:08 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 13 Jun 2015 17:08:24 +0000 (18:08 +0100)
tests/lib
tests/tests/debpolicy-newreject

index 5b93d98..e1bc6d9 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`
index 0400c08..765c4d2 100755 (executable)
@@ -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