Hi Benjamin,
On Fri, Aug 23, 2013 at 07:15:05PM +0200, Benjamin Cama wrote:
> Hi everyone,
>
> I had this issue for some times with gbp-pq (what a hard command to
Hopefulle "gbp pq" is abit easier to type.
> type…). For me, the problem is that the "branch...patch-queue/branch"
> commit range is silly: gitrevisions(7) tells that it includes both
> commits reachable from either branch, but not both. I don't know why
> this was chosen, it doesn't correspond to what I thought this command
> did. Incidentally, the "branch..patch-queue/branch" syntax seems to do
> exactly what we want: start from the merge base, only walking along the
> second branch.
That makes sense (I wonder why nobody notice so far). I've pushed a
slightly different version.
Thanks!
-- Guido
P.S.: I'll leave the bug open since there's more we can do to optimize
the rebase itself.
>
> I'm still not at ease with gbp-pq and not very good at Debian packaging,
> so maybe this is wrong, but the attached patch may fix this problem.
>
> Regards,
> --
> Benjamin Cama <benjamin.c...@telecom-bretagne.eu>
> From ee025290021367f8b9cbff6bff2b88c56d401e45 Mon Sep 17 00:00:00 2001
> From: Benjamin Cama <benjamin.c...@telecom-bretagne.eu>
> Date: Fri, 23 Aug 2013 19:03:12 +0200
> Subject: [PATCH] Do not include patches from packaging branch when exporting
> the pq
>
> ---
> gbp/git/repository.py | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/gbp/git/repository.py b/gbp/git/repository.py
> index 502a391..69f7e8a 100644
> --- a/gbp/git/repository.py
> +++ b/gbp/git/repository.py
> @@ -1450,7 +1450,7 @@ class GitRepository(object):
> options = GitArgs('-N', '-k',
> '-o', output_dir)
> options.add_cond(not signature, '--no-signature')
> - options.add('%s...%s' % (start, end))
> + options.add('%s..%s' % (start, end))
> options.add_cond(thread, '--thread=%s' % thread, '--no-thread')
>
> output, ret = self._git_getoutput('format-patch', options.args)
> --
> 1.7.2.5
>
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
