Package: git-buildpackage Version: 0.7.0 Severity: normal Dear Maintainer,
import-dsc create merge commits instead of normal commits for the first Debian patch after a new upstream release. This is very impractical. These commits are continuous sources of conflicts and this makes doing rebasing operations (for example for cosmetic purposes or to add changelogs in the commit message like suggested in bug #577810) very time consuming or practically impossible for packages with longer histories. import-dsc will create an history like this: ``` * 244a2a6 (HEAD -> master, tag: debian/0.9b-2) Imported Debian patch 0.9b-2 * 82a9cf5 (tag: debian/0.9b-1.1) Imported Debian patch 0.9b-1.1 * 2531e71 (tag: debian/0.9b-1) Imported Debian patch 0.9b-1 |\ | * 255de2b (tag: upstream/0.9b, upstream) Imported Upstream version 0.9b * | a7bfdf7 (tag: debian/0.8b-1) Imported Debian patch 0.8b-1 |/ * ce22f3b (tag: upstream/0.8b) Imported Upstream version 0.8b ``` It should instead act like import-orig does in the normal case, creating an history like the following: ``` * 244a2a6 (HEAD -> master, tag: debian/0.9b-2) Imported Debian patch 0.9b-2 * 82a9cf5 (tag: debian/0.9b-1.1) Imported Debian patch 0.9b-1.1 * 2531e71 (tag: debian/0.9b-1) Imported Debian patch 0.9b-1 * xxxxxxx Merge tag 'upstream/0.9b' |\ | * 255de2b (tag: upstream/0.9b, upstream) Imported Upstream version 0.9b * | a7bfdf7 (tag: debian/0.8b-1) Imported Debian patch 0.8b-1 |/ * xxxxxxx Merge tag 'upstream/0.8b' * ce22f3b (tag: upstream/0.8b) Imported Upstream version 0.8b ``` In this way each Debian patch is represented by a normal commit and operations like cherry-picking and rebasing became feasible.
