diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-07-04 22:11:09 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-07-04 22:17:05 +0100 |
commit | 076a8ac565082e73b3bae409df4492701654d74a (patch) | |
tree | dd5fa8a02fe43538ea623b3a49f0d44ad9b72de7 /tests/lib | |
parent | 4afda6c62b97cdb6e3097dc9f5703aa65f5124d8 (diff) |
Test suite: Use "dgit setup-mergechangelogs" and abolish t-prep-mergechangelogs
Diffstat (limited to 'tests/lib')
-rw-r--r-- | tests/lib | 9 |
1 files changed, 0 insertions, 9 deletions
@@ -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` |