Path: csiph.com!news.dns-netz.com!news.freedyn.net!aioe.org!bofh.it!news.nic.it!robomod From: Raphael Hertzog Newsgroups: linux.debian.maint.python Subject: Re: Git, gbp blues Date: Mon, 26 Aug 2019 11:20:01 +0200 Message-ID: References: X-Mailbox-Line: From debian-python-request@lists.debian.org Mon Aug 26 09:19:20 2019 Old-Return-Path: X-Amavis-Spam-Status: No, score=-11.731 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, HEADER_FROM_DIFFERENT_DOMAINS=0.249, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02, PGPSIGNATURE=-5] autolearn=ham autolearn_force=no Mail-Followup-To: Raphael Hertzog , Dmitry Shachnev , =?utf-8?B?R3XDsGrDs24gR3XDsGrDs25zc29u?= , debian-python@lists.debian.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="SUOF0GtieIMvvwua" Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Virus-Status: Clean X-Mailing-List: archive/latest/17186 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/20190826091833.GF991@home.ouaza.com Approved: robomod@news.nic.it Lines: 45 Organization: linux.* mail to news gateway Sender: robomod@news.nic.it X-Original-Cc: =?utf-8?B?R3XDsGrDs24gR3XDsGrDs25zc29u?= , debian-python@lists.debian.org X-Original-Date: Mon, 26 Aug 2019 11:18:33 +0200 X-Original-Message-ID: <20190826091833.GF991@home.ouaza.com> X-Original-References: <20190825195005.GH1643@belkar.wrar.name> <20190825201938.GA13907@mitya57.me> Xref: csiph.com linux.debian.maint.python:11673 --SUOF0GtieIMvvwua Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, 25 Aug 2019, Dmitry Shachnev wrote: > The correct procedure is running =E2=80=9Cgbp pq import=E2=80=9D *before*= importing a new > tarball. Then after importing you do =E2=80=9Cgbp pq rebase=E2=80=9D. >=20 > Sometimes I myself forget to run =E2=80=9Cgbp pq import=E2=80=9D. In this= case I do the > following: Instead you should use "gbp pq import --time-machine=3DX" where X is the number of commits that you accept to go backwards to try to find a point where the patch series can be applied. Then you are on your branch, ready for a rebase... Cheers, --=20 Rapha=C3=ABl Hertzog =E2=97=88 Debian Developer Support Debian LTS: https://www.freexian.com/services/debian-lts.html Learn to master Debian: https://debian-handbook.info/get/ --SUOF0GtieIMvvwua Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Comment: Signed by Raphael Hertzog iQEzBAABCgAdFiEE1823g1EQnhJ1LsbSA4gdq+vCmrkFAl1jo+gACgkQA4gdq+vC mrmoogf6AzNnh9x0UN2X5QBQCBeIRDrLvff8e7fLXH15al/MDIiYFnBQxfAReIlL moYLTDjl7/+s7RxGPhyPfum7HPxMIfOBvUf492GscuJt1/4q70nlglC1HJASt/+6 ivxP33W/2OpdvGyGdZSeTVHEjk3jxQiYN+ECBBBPkVPW46aeNB5jPy0+2VcLzQSZ 0k5Uec2wfD0GfuANWpOviwEqPqj/Zjacf2Qpj/gFTrmLC/rLNsu8C4XsGIBIly1U nJiptgqeq5chbrRa+2tJQsMjhf3mBtojqt2D/yyWeFTJDssPZPmo/FiTAFMR0E2v 4UzYZt8FfuC7hQNzdhhlBO2n73hl5Q== =PASG -----END PGP SIGNATURE----- --SUOF0GtieIMvvwua--