summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/lib9
-rwxr-xr-xtests/tests/debpolicy-newreject2
2 files changed, 1 insertions, 10 deletions
diff --git a/tests/lib b/tests/lib
index 9fc056e..fbe04b7 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 6987ef3..8bc0c86 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