Re: git-dpm vs gbp-pq: new upstream and patch refresh (long)

2014-09-05 Thread Simon McVittie
On 04/09/14 20:40, Barry Warsaw wrote: The file is patched, but now I have an d/p/0005- file instead of a modified 0003- patch file. Sigh. The systemd maintainers configured git-buildpackage (in their debian/gbp.conf) to not use patch numbers. I'm starting to think that's The Right Thing in

Re: git-dpm vs gbp-pq: new upstream and patch refresh (long)

2014-09-05 Thread Simon McVittie
On 05/09/14 13:10, Simon McVittie wrote: On 04/09/14 20:40, Barry Warsaw wrote: The file is patched, but now I have an d/p/0005- file instead of a modified 0003- patch file. Sigh. The systemd maintainers [...] It might also be worth noting that the systemd maintainers switched from git-dpm

Re: git-dpm vs gbp-pq: new upstream and patch refresh (long)

2014-09-05 Thread Barry Warsaw
On Sep 05, 2014, at 01:10 PM, Simon McVittie wrote: The systemd maintainers configured git-buildpackage (in their debian/gbp.conf) to not use patch numbers. I'm starting to think that's The Right Thing in general. Agreed. I've filed wishlist bug #760578 for this, and other enhancements to patch

Re: git-dpm vs gbp-pq: new upstream and patch refresh (long)

2014-09-05 Thread Barry Warsaw
On Sep 05, 2014, at 01:21 PM, Simon McVittie wrote: It might also be worth noting that the systemd maintainers switched from git-dpm to gbp-pq recently (between 204 and 208, I think), so they obviously didn't think git-dpm was the better option. Are there any artifacts of this switch, e.g.

Re: git-dpm vs gbp-pq: new upstream and patch refresh (long)

2014-09-05 Thread Simon McVittie
On 05/09/14 15:53, Barry Warsaw wrote: On Sep 05, 2014, at 01:21 PM, Simon McVittie wrote: It might also be worth noting that the systemd maintainers switched from git-dpm to gbp-pq recently (between 204 and 208, I think), so they obviously didn't think git-dpm was the better option. Are

Re: git-dpm vs gbp-pq: new upstream and patch refresh (long)

2014-09-05 Thread Martin Pitt
Hey all, Simon McVittie [2014-09-05 16:05 +0100]: It might also be worth noting that the systemd maintainers switched from git-dpm to gbp-pq recently (between 204 and 208, I think), so they obviously didn't think git-dpm was the better option. I don't think anyone in pkg-systemd@ has

Re: git-dpm vs gbp-pq: new upstream and patch refresh (long)

2014-09-05 Thread Simon McVittie
On 05/09/14 16:18, Martin Pitt wrote: I don't think anyone in pkg-systemd@ has looked at git-dpm yet. In fact we switched from gitpkg to standard git-buildpackage. Ugh, sorry. So I'm not sure where switched from git-dpm came from? smcv mis-remembering the situation, evidently. S --

Re: git-dpm vs gbp-pq: new upstream and patch refresh (long)

2014-09-05 Thread Barry Warsaw
Hi Martin, thanks for the information. On Sep 05, 2014, at 05:18 PM, Martin Pitt wrote: gitpkg is rather complicated to use and set up, only about 3 people in Debian know how it works properly, and it makes it really hard to track a set of changes against trunk over time (i. e. the equivalent of

Re: git-dpm vs gbp-pq: new upstream and patch refresh (long)

2014-09-05 Thread Barry Warsaw
Quick follow up. Since yesterday, I filed a few bugs on the git-dpm package and already got back some useful information. * tag format This is configurable, so it's easy to get the gbp style tags. These commands set the style in the repo so I think it should be propagated to anybody who checks

Re: git-dpm vs gbp-pq: new upstream and patch refresh (long)

2014-09-04 Thread Scott Kitterman
On Thursday, September 04, 2014 15:40:42 Barry Warsaw wrote: That gets you a source package, but the binary package FTBFS because one additional test cannot be run during the build process (there's a DEP-8 test for full coverage). Now though, you *must* commit or stash the d/changelog change.

Re: git-dpm vs gbp-pq: new upstream and patch refresh (long)

2014-09-04 Thread Scott Kitterman
On Thursday, September 04, 2014 16:05:53 Scott Kitterman wrote: On Thursday, September 04, 2014 15:40:42 Barry Warsaw wrote: That gets you a source package, but the binary package FTBFS because one additional test cannot be run during the build process (there's a DEP-8 test for full

Re: git-dpm vs gbp-pq: new upstream and patch refresh (long)

2014-09-04 Thread Barry Warsaw
On Sep 04, 2014, at 04:36 PM, Scott Kitterman wrote: Actually, nevermind. That's not the problem you were trying to solve, although you could remove the patch as described and then apply the updated patch at the end of the series. Yeah, though sometimes for legitimate reasons you can't reorder

Re: git-dpm vs gbp-pq: new upstream and patch refresh (long)

2014-09-04 Thread Raphael Hertzog
On Thu, 04 Sep 2014, Barry Warsaw wrote: On Sep 04, 2014, at 04:36 PM, Scott Kitterman wrote: Actually, nevermind. That's not the problem you were trying to solve, although you could remove the patch as described and then apply the updated patch at the end of the series. Yeah, though

Re: git-dpm vs gbp-pq: new upstream and patch refresh (long)

2014-09-04 Thread Barry Warsaw
On Sep 05, 2014, at 12:25 AM, Raphael Hertzog wrote: As others have mentionned, you should use git rebase -i ancestor. This is what you want to use on your patch-queue branch to modifiy individual commits, reorder them, or drop them. Brilliant. For git-dpm then this would be: $ git-dpm