Package: git-dpm Version: 0.9.1-1 Severity: normal Still discovering git-dpm, I tried to do something basic: - make a packaging change in debian/sid (adding debian/README.source) - switch to debian/experimental - merge debian/sid into it to get the latest packaging changes
But this doesn't work at all because debian/sid contains all the upstream patches applied and it generates lots of conflicts. When the patches are not applied, I might have to cleanup debian/patches after the merge but at least the merge worked fine and I can make sure that I have integrated all my packaging changes... (I have dpkg-mergechangelogs configured too) So the only solution that I have right now is to cherry pick packaging changes from one version to the other and hope to not forget something... and this will not work easily either if my changes contain a one-line modification to debian/changelog (describing the change) as what you usually get when you're used to use "dch && debcommit". So "git-dpm" should offer a way to merge packaging branches: - avoiding conflict on upstream files - avoiding conflict on unchanged patches in debian/patches (right now the commit id and and the blob ids differ and generate conflicts) I'm not sure how to best achieve this though. -- System Information: Debian Release: stretch/sid APT prefers squeeze-lts APT policy: (500, 'squeeze-lts'), (500, 'oldoldstable'), (500, 'unstable'), (500, 'testing'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.2.0-1-amd64 (SMP w/4 CPU cores) Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages git-dpm depends on: ii dpkg-dev 1.18.3 ii git 1:2.6.1-1 Versions of packages git-dpm recommends: ii bzip2 1.0.6-8 ii devscripts 2.15.9 ii sensible-utils 0.0.9 ii xz-utils 5.1.1alpha+20120614-2.1 Versions of packages git-dpm suggests: ii pristine-tar 1.33 ii sharutils 1:4.15.2-1 -- no debconf information
