Path: csiph.com!news.dns-netz.com!news.freedyn.net!aioe.org!bofh.it!news.nic.it!robomod From: Andrey Rahmatullin Newsgroups: linux.debian.maint.python Subject: Re: Git, gbp blues Date: Mon, 26 Aug 2019 08:40:01 +0200 Message-ID: References: X-Mailbox-Line: From debian-python-request@lists.debian.org Mon Aug 26 06:31:38 2019 Old-Return-Path: X-Amavis-Spam-Status: No, score=-11.98 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02, PGPSIGNATURE=-5, RCVD_IN_DNSWL_NONE=-0.0001] autolearn=ham autolearn_force=no X-Policyd-Weight: using cached result; rate: -3.5 Dkim-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=wrar.name; s=20160710; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID: Subject:To:From:Date:Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=ejGqZiJFwXkYjKbKRBORMJcUqB/1mlC7lO3f/3MpS2E=; b=m/++Ipe2Kr3FgWzCgBdgiHHu8d WjRk67cvXvOMdOF7T58PXWTa6jeygho5w13tlBMG/HfjjvTeI1KQSasgFBw3QLB2ku40FSFkj53ur aF/q7FzX/wVKSR79PGhYi0RCXtGyh4AfflyQtdnQcxJRLl6V4ZWdK+bjvJ54TpqhqlmE=; MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="FUFe+yI/t+r3nyH4" Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Mailing-List: archive/latest/17185 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/20190826063124.GJ1643@belkar.wrar.name Approved: robomod@news.nic.it Lines: 57 Organization: linux.* mail to news gateway Sender: robomod@news.nic.it X-Original-Date: Mon, 26 Aug 2019 11:31:24 +0500 X-Original-Message-ID: <20190826063124.GJ1643@belkar.wrar.name> X-Original-References: <20190825195005.GH1643@belkar.wrar.name> <20190825201938.GA13907@mitya57.me> Xref: csiph.com linux.debian.maint.python:11672 --FUFe+yI/t+r3nyH4 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Aug 26, 2019 at 08:20:13AM +0200, Gu=C3=B0j=C3=B3n Gu=C3=B0j=C3=B3n= sson wrote: > > The correct procedure is running =E2=80=9Cgbp pq import=E2=80=9D *befor= e* importing a new > > tarball. Then after importing you do =E2=80=9Cgbp pq rebase=E2=80=9D. > In fact I did do that. Then you would get an error message when trying to do that second time. > > > But fixing the patches with quilt before importing them the second > > > time seems to fix all my problems. > > If it does not break the patches metadata then it also works. > But what other way is possible? gbp pq rebase. Seriously. > The patch queue must apply cleanly in gbp pq import=20 And it will, of course. > in general you can assume it doesn't with new upstream and > old patch queue. This is not something you can or should do. > I still don't understand how to edit the patches the correct way > after a new upstream release. gbp pq rebase, as the wiki page tells you. --=20 WBR, wRAR --FUFe+yI/t+r3nyH4 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJhBAABCgBLFiEEolIP6gqGcKZh3YxVM2L3AxpJkuEFAl1jfLstFIAAAAAAFQAP cGthLWFkZHJlc3NAZ251cGcub3Jnd3JhckBkZWJpYW4ub3JnAAoJEDNi9wMaSZLh /WEP/ie7hMp1ut8M4iwSTaXLmaaJqVYLgQtdMLSauFPBkkqA9a24MTvQbAracoMh wTUwD9iAnip2xGDVk6qseYoXyxUaYcyhdDG2vrEzxg75xmkgJWmXlWU7VLlG4dlh o+t4U+RLtz8n/21WvzoyTb5bvALl7FkEIJsHvr7Hk+MrwHd932xC0A5XoE0TwgtP pEppKmESyS1Pm0jzoO1Z45PMtZjv92LCpGM7emZ+kaGpIre5VOBj9nhfWBWt7icA eZ97oMifjBSdZznCdPx6vN1ZnuGVzsE4+wauHnrXTCREJ9MczMWFbC0WHLQdOUOv HkCDX5NYiOtvhGCrU4jxHUGnLPYlJHUuf/zo7wsxbNXd9Ij4z8O7VbilsgdvodXW tNkY2HJGyTSkp3lgxEilD8I/DYR+n5/SuOuJttJ25/Y5z9TQYVNYBaSo4Nqf4W+C WBn+dZ4C2R07+Fx0vlC8c8YsfQM9C0Oo/8cptgDaTfo34GaTxmFkcCcZlUUfYJPP KRV9XMO56uWGIj5gamN4QZd1vADx11QxB9aAiXALnZq2m0LWcPh05Q+dAmisyydc KB1kkUC7IgRRZJzDYZviS5XBCvTb+/cbtXumH1xHoJ1udIj59SZ4DmwXBPHV4sM0 UmxD/PzP+f9yNvmpGhIyXLeRr03I5G5oAAspAKahrR6d3eBe =xILv -----END PGP SIGNATURE----- --FUFe+yI/t+r3nyH4--