summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/lib9
-rwxr-xr-xtests/tests/debpolicy-newreject1
2 files changed, 10 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`
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