Path: csiph.com!aioe.org!bofh.it!news.nic.it!robomod From: Simon McVittie Newsgroups: linux.debian.maint.python Subject: Re: git-dpm -> gbp conversion (mass-change) Date: Thu, 09 Aug 2018 12:20:01 +0200 Message-ID: References: X-Original-To: debian-python@lists.debian.org X-Mailbox-Line: From debian-python-request@lists.debian.org Thu Aug 9 10:18:58 2018 Old-Return-Path: X-Amavis-Spam-Status: No, score=-6.98 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02, RCVD_IN_DNSWL_NONE=-0.0001] autolearn=ham autolearn_force=no X-Policyd-Weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .debian. - helo: .illusion.pseudorandom. - helo-domain: .pseudorandom.) FROM/MX_MATCHES_NOT_HELO(DOMAIN)=0; rate: -5 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Mailing-List: archive/latest/16200 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/20180809101834.GA28677@espresso.pseudorandom.co.uk Approved: robomod@news.nic.it Lines: 19 Organization: linux.* mail to news gateway Sender: robomod@news.nic.it X-Original-Date: Thu, 9 Aug 2018 11:18:34 +0100 X-Original-Message-ID: <20180809101834.GA28677@espresso.pseudorandom.co.uk> X-Original-References: <20180802151614.jlu5w3l3lnhwi3he@werner.olasd.eu> <20180804070542.ehshncjtlx4lsswf@macbookair> <87h8k53x69.fsf@vostro.rath.org> <87eff84qf3.fsf@vostro.rath.org> <4a75664f-b4d6-7eb0-f5fd-1974b20c53be@debian.org> Xref: csiph.com linux.debian.maint.python:10780 On Thu, 09 Aug 2018 at 10:16:31 +0200, Thomas Goirand wrote: > Now, if all goes well, and if the above cases are fixed, them I'm fine > using "gbp pq", but it's not any better than fixing by hand using quilt. One advantage of both quilt and gbp-pq over git-dpm (and probably git-debrebase) is that they interoperate: quilt and gbp-pq both work well in a "patches-unapplied" git repository. If one team member (for instance me) prefers to use gbp-pq, and another team member (for instance Thomas) prefers to use plain quilt, then we can share one git repository without significant problems: the worst that normally happens is a bit of unnecessary diffstat for the lines matching /^(git )?diff/, /^Index:/, etc. if one of us re-exports the whole patch series. I personally think gbp-pq is a better tool than quilt because it lets us use 'git rebase' on the patch series, but part of the point of choosing the gbp-pq-compatible repository layout is that it isn't either/or: we can use both. smcv