Package: git-buildpackage
Version: 0.6.0~git20120601
Severity: minor
File: /usr/bin/gbp-pq
Tags: upstream
I was using git, fallowed by git format-patch, fallowed by adding the
quilt patches, and found this non-ideal, so I decided to try out gbp-pq.
However, I have found it to be non-ideal for a number of reasons.
1. gbp-pq rebase is not intelligent enough to handle non-fast-forward histories
It will not search the reflog, etc, and then ends up doing this insane
spitting out
of all patches on the current branch, when at the least it should spit out a
warning.
I then find myself manually rebasing the patch-queue/foo branch to foo all the
time.
2. gbp-pq doesn't support a patch queue that is right on top of the upstream,
or more generally, where the patch queue branch is not a fast forward of the
branch it is
a patch queue for. It should be able to handle a patch queue branch that has at
least
one shared ancestor with the branch being exported to. It could export by
1. doing a recursive git merge, and if there are conflicts, letting git do
what it is
strong at: merging
and then when the merge is complete
2. reset the branch to where it just was, and replace the patches in
debian/patches with
the result of the merge.
It could alternatively abort on merge conflicts, but I think letting the user
use git to do this merge
could be quite useful, and make it more powerful than quilt.
I tried to just bypass gbp-pq by using git format-patch
upstream/version..patch-queue/branch ,
but having a tool with knowledge of the series file for ordering of patches,
instead of 0001, 0002,
etc is a "nice to have".
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (500, 'testing'), (1, 'experimental')
Architecture: armel (armv5tel)
Kernel: Linux 3.4.0-tomoyo-00006-gfd64aac (PREEMPT)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash
Versions of packages git-buildpackage depends on:
ii devscripts 2.11.9
ii git 1:1.7.10.4-1
ii python 2.7.3~rc2-1
ii python-dateutil 1.5-1
ii python2.7 2.7.3~rc2-2.1
Versions of packages git-buildpackage recommends:
pn cowbuilder <none>
ii pristine-tar 1.25
Versions of packages git-buildpackage suggests:
pn python-notify <none>
pn unzip <none>
-- no debconf information
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
