Package: git-buildpackage
Version: 0.6.22
Severity: wishlist
dpkg-mergechangelogs (from the dpkg-dev package) is a very nice tool
that allows git to automatically merge debian/changelogs.
It is especially useful when updating backports branches, as usually the
changelog is the only thing causing a merge conflict.
Configuring it is very simple [1], but it is best done at the time of
repository creation.
I'm therefore suggesting that `gbp clone` and maybe even a `gbp init` add
the necessary lines in the .git directory to make this automatic.
If the suggestion here will be accepted, I might prepare a patch to implement
it if needed. Please let me know.
Many thanks and regards
Afif
1. From dpkg-mergechangelogs(1):
~~~
INTEGRATION WITH GIT
If you want to use this program to merge Debian changelog files in a git
repository,
you have first to register a new merge driver in .git/config or
~/.gitconfig:
[merge "dpkg-mergechangelogs"]
name = debian/changelog merge driver
driver = dpkg-mergechangelogs -m %O %A %B %A
Then you have to setup the merge attribute for the debian/changelog file
either in
.gitattributes in the repository itself, or in .git/info/attributes:
debian/changelog merge=dpkg-mergechangelogs
~~~
-- System Information:
Debian Release: 8.3
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=ar_SA.UTF-8, LC_CTYPE=ar_SA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages git-buildpackage depends on:
ii devscripts 2.16.1~bpo8+1
ii git 1:2.1.4-2.1+deb8u2
ii man-db 2.7.0.2-5
ii python 2.7.9-1
ii python-dateutil 2.2-2
ii python-pkg-resources 5.5.1-1
Versions of packages git-buildpackage recommends:
ii cowbuilder 0.73
ii pristine-tar 1.33
Versions of packages git-buildpackage suggests:
ii python-notify 0.1.1-4
ii unzip 6.0-16+deb8u2
-- no debconf information
