Groups > linux.debian.maint.python > #10781

Re: git-dpm -> gbp conversion (mass-change)

Path	csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Brian May <bam@debian.org>
Newsgroups	linux.debian.maint.python
Subject	Re: git-dpm -> gbp conversion (mass-change)
Date	Thu, 09 Aug 2018 13:00:01 +0200
Message-ID	<wkQPD-2oA-3@gated-at.bofh.it> (permalink)
References	<winI5-sq-1@gated-at.bofh.it> <wiyWS-793-9@gated-at.bofh.it> <wiZkl-680-1@gated-at.bofh.it> <wkqVc-3lQ-15@gated-at.bofh.it> <wkuYN-5Jj-1@gated-at.bofh.it> <wkxWF-7xC-3@gated-at.bofh.it> <wkCjD-1Tt-7@gated-at.bofh.it> <wkOkN-Y8-5@gated-at.bofh.it>
X-Original-To	debian-python@lists.debian.org
X-Mailbox-Line	From debian-python-request@lists.debian.org Thu Aug 9 10:54:37 2018
Old-Return-Path	<bam@debian.org>
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] autolearn=ham autolearn_force=no
X-Policyd-Weight	using cached result; rate: -5
Organization	Debian
MIME-Version	1.0
Content-Type	text/plain
X-Mailing-List	<debian-python@lists.debian.org> archive/latest/16201
List-ID	<debian-python.lists.debian.org>
List-URL	<https://lists.debian.org/debian-python/>
List-Archive	https://lists.debian.org/msgid-search/877ekzolnr.fsf@silverfish.pri
Approved	robomod@news.nic.it
Lines	22
Sender	robomod@news.nic.it
X-Original-Date	Thu, 09 Aug 2018 20:54:16 +1000
X-Original-Message-ID	<877ekzolnr.fsf@silverfish.pri>
X-Original-References	<20180802151614.jlu5w3l3lnhwi3he@werner.olasd.eu> <CAOO6c=xY4V+-sLo6u72O+VXz6dAVR2ALe60U-=nx6uMfSNjTKA@mail.gmail.com> <20180804070542.ehshncjtlx4lsswf@macbookair> <c9c717a3-0636-35b2-939b-a2fb7e7a9cfe@debian.org> <87h8k53x69.fsf@vostro.rath.org> <e55b1fb5-949d-e2c5-4993-3d6fd999c34f@debian.org> <87eff84qf3.fsf@vostro.rath.org> <4a75664f-b4d6-7eb0-f5fd-1974b20c53be@debian.org>
Xref	csiph.com linux.debian.maint.python:10781

Show key headers only | View raw

Thomas Goirand <zigo@debian.org> writes:

> Let's say a patch has been applied upstream. In such case, I just do a
> few "quilt push" to check, then I see one is already applied (by running
> "patch --dry-run -P1 <debian/patches/foo.patch"), then I just remove the
> patch from the series file, and I'm done. In case of using git with the
> rebase thing, then I get into useless trouble.

This case is easy. When rebase comes up with a conflict, you can tell it
to skip/drop that entire change.

This tends to be my default choice when I don't understand why something
conflicts during such a rebase.

> Another case is if upstream moved sources from one directory to another.
> In such case, I just edit the patch directly to fix the path. With a git
> rebase, you'd probably have to rewrite all the patch by hand. Here
> again, that's useless trouble.

Yes, that case is harder to deal with.
-- 
Brian May <bam@debian.org>

Thread

Report from the Python BoF @ DebConf18 Nicolas Dandrimont <olasd@debian.org> - 2018-08-02 17:30 +0200
  git-dpm -> gbp conversion (mass-change) Ondrej Novy <novy@ondrej.org> - 2018-08-03 05:30 +0200
    Re: git-dpm -> gbp conversion (mass-change) "W. Martin Borgert" <debacle@debian.org> - 2018-08-03 06:00 +0200
      Re: git-dpm -> gbp conversion (mass-change) Scott Kitterman <debian@kitterman.com> - 2018-08-03 06:40 +0200
        Re: git-dpm -> gbp conversion (mass-change) "W. Martin Borgert" <debacle@debian.org> - 2018-08-03 08:30 +0200
          Re: git-dpm -> gbp conversion (mass-change) Simon McVittie <smcv@debian.org> - 2018-08-03 09:10 +0200
            Re: git-dpm -> gbp conversion (mass-change) "W. Martin Borgert" <debacle@debian.org> - 2018-08-03 10:20 +0200
              Re: git-dpm -> gbp conversion (mass-change) "W. Martin Borgert" <debacle@debian.org> - 2018-08-03 10:30 +0200
    Re: git-dpm -> gbp conversion (mass-change) Sandro Tosi <morph@debian.org> - 2018-08-03 15:40 +0200
    Re: git-dpm -> gbp conversion (mass-change) Ruben Undheim <lists@beebeetle.com> - 2018-08-04 09:40 +0200
      Re: git-dpm -> gbp conversion (mass-change) Thomas Goirand <zigo@debian.org> - 2018-08-08 09:20 +0200
        Re: git-dpm -> gbp conversion (mass-change) Nikolaus Rath <Nikolaus@rath.org> - 2018-08-08 13:40 +0200
          Re: git-dpm -> gbp conversion (mass-change) Thomas Goirand <zigo@debian.org> - 2018-08-08 16:50 +0200
            Re: git-dpm -> gbp conversion (mass-change) Nikolaus Rath <Nikolaus@rath.org> - 2018-08-08 21:30 +0200
              Re: git-dpm -> gbp conversion (mass-change) Thomas Goirand <zigo@debian.org> - 2018-08-09 10:20 +0200
                Re: git-dpm -> gbp conversion (mass-change) Ondrej Novy <novy@ondrej.org> - 2018-08-09 11:00 +0200
                Re: git-dpm -> gbp conversion (mass-change) Simon McVittie <smcv@debian.org> - 2018-08-09 12:20 +0200
                Re: git-dpm -> gbp conversion (mass-change) Brian May <bam@debian.org> - 2018-08-09 13:00 +0200
          Re: git-dpm -> gbp conversion (mass-change) Brian May <bam@debian.org> - 2018-08-08 23:50 +0200
        Re: git-dpm -> gbp conversion (mass-change) Ruben Undheim <lists@beebeetle.com> - 2018-08-08 16:00 +0200
          Re: git-dpm -> gbp conversion (mass-change) Thomas Goirand <zigo@debian.org> - 2018-08-08 17:00 +0200
          Re: git-dpm -> gbp conversion (mass-change) Brian May <bam@debian.org> - 2018-08-09 00:00 +0200
    Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] Ondrej Novy <novy@ondrej.org> - 2018-08-08 16:30 +0200
      Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] Scott Kitterman <debian@kitterman.com> - 2018-08-10 22:30 +0200
        Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] Scott Kitterman <debian@kitterman.com> - 2018-08-11 16:20 +0200
          Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] eamanu15 <emmanuelarias30@gmail.com> - 2018-08-12 15:30 +0200
            Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] Dmitry Shachnev <mitya57@debian.org> - 2018-08-12 20:30 +0200
              Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] eamanu15 <emmanuelarias30@gmail.com> - 2018-08-15 03:10 +0200
                Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] Scott Kitterman <debian@kitterman.com> - 2018-08-15 03:20 +0200
                Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] Lars Kruse <lists@sumpfralle.de> - 2018-08-15 04:20 +0200
                Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] Ondrej Novy <novy@ondrej.org> - 2018-08-15 09:10 +0200
                Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] Pierre-Elliott Bécue <becue@crans.org> - 2018-08-15 13:00 +0200
                Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] Ondrej Novy <novy@ondrej.org> - 2018-08-15 13:20 +0200
        Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] Ondrej Novy <novy@ondrej.org> - 2018-08-11 16:20 +0200
  Re: Report from the Python BoF @ DebConf18 Sandro Tosi <morph@debian.org> - 2018-09-19 15:40 +0200
    Re: Report from the Python BoF @ DebConf18 Thomas Goirand <zigo@debian.org> - 2018-09-19 17:40 +0200
    Upstreams dropping Python 2 support (Was: Re: Report from the Python  BoF @ DebConf18) Dmitry Shachnev <mitya57@debian.org> - 2018-09-27 12:00 +0200
      Re: Upstreams dropping Python 2 support Ole Streicher <olebole@debian.org> - 2018-09-27 12:20 +0200
        Re: Upstreams dropping Python 2 support Dmitry Shachnev <mitya57@debian.org> - 2018-09-27 13:30 +0200
        Re: Upstreams dropping Python 2 support Simon McVittie <smcv@debian.org> - 2018-09-27 15:20 +0200

csiph-web