Path: csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod From: Ruben Undheim Newsgroups: linux.debian.maint.python Subject: Re: git-dpm -> gbp conversion (mass-change) Date: Wed, 08 Aug 2018 16:00:01 +0200 Message-ID: References: X-Original-To: debian-python@lists.debian.org X-Mailbox-Line: From debian-python-request@lists.debian.org Wed Aug 8 13:57:57 2018 Old-Return-Path: X-Amavis-Spam-Status: No, score=-6.187 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02, RDNS_NONE=0.793] autolearn=no autolearn_force=no X-Policyd-Weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_FROM_MX=-3.1; rate: -6.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: NeoMutt/20170113 (1.7.2) X-Mailing-List: archive/latest/16191 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/20180808135525.rrubo2f3hazzounz@macbookair Approved: robomod@news.nic.it Lines: 19 Organization: linux.* mail to news gateway Sender: robomod@news.nic.it X-Original-Date: Wed, 8 Aug 2018 15:55:25 +0200 X-Original-Message-ID: <20180808135525.rrubo2f3hazzounz@macbookair> X-Original-References: <20180802151614.jlu5w3l3lnhwi3he@werner.olasd.eu> <20180804070542.ehshncjtlx4lsswf@macbookair> Xref: csiph.com linux.debian.maint.python:10771 Hi, > The problem with git-debrebase will be the same as with git-dpm. As soon > as you try to upgrade / merge a new upstream release, you dive into a > rebase/conflict nightmare. So in other words, you prefer to solve the same conflicts manually with quilt/quilt refresh or get similar but worse (I think) rebase conflicts with "gbp pq rebase"? There is no nightmare unless there are patch conflicts. All the tools will in that case give you a nightmare in one way or the other. It is just that some of them attempt to handle it a bit more elegantly than the others. For people familar with git (and rebase) - the nightmare should not be bad at all with git-debrebase. (personally I solve conflicts with quilt -f /quilt refresh when using gbp).. Cheers, Ruben