Path: csiph.com!weretis.net!feeder7.news.weretis.net!news.dns-netz.com!news.freedyn.net!aioe.org!bofh.it!news.nic.it!robomod From: Dmitry Shachnev Newsgroups: linux.debian.maint.python Subject: Re: Git, gbp blues Date: Sun, 25 Aug 2019 22:20:01 +0200 Message-ID: References: X-Mailbox-Line: From debian-python-request@lists.debian.org Sun Aug 25 20:19:55 2019 Old-Return-Path: X-Amavis-Spam-Status: No, score=-11.636 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DIGITS_LETTERS=1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, LDO_WHITELIST=-5, MD5_SHA1_SUM=-1, MURPHY_DRUGS_REL8=0.02, PGPSIGNATURE=-5, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.406] autolearn=ham autolearn_force=no X-Policyd-Weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-lj1-f193.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -5.5 X-Google-Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=PJKj6xkqj6IAM+pP1dfSeTZgNgOedvDeurw2ZHLen7M=; b=sR3fpADsDQgB7Hbvxi8lgMdvIwFObQt1UWX+zaK1AcwI8kbyq9LT+N5ROYpW6hFG9v C3JcbjUydG3FRt56lb00ghO+2WeBkYc8GsFR+AKKmxbDLo6p3g/FkX7xmp1FdJ6vvt1+ G7YY3XhhyxeVvktQatfql4nzRovvNG4lwsKWF+aPwVV8o/MVSyhO8vLCnI96/A8jkHqV WGKOsArcV7Uv+TVaGizJ/Jbe5BX0ELitfdAVNiVgqTIUv4JcDx0c91r8rTwr75xnah5m E5zUFB8St/Z1N3zMTvkOpZTKw2tHolHEUOBDl1BDg2Eoc+MEAYt1wgDUn0xoZocEm1HD p0Zw== X-Gm-Message-State: APjAAAUHUa8msFeTsBgduiTiVYMZf/oCzIuznXaRfLNaEh3nDwc67JsH W6Slvhv64xjpk7rCJ60zXW0= X-Google-SMTP-Source: APXvYqxXvfiAlARcoDxgJE+yuJ8CyCw4b4GSSJekBiEHMmBHeRG4vOB5bWzPZLYwO5F5izoMDx+7ug== X-Received: by 2002:a2e:29cb:: with SMTP id p72mr8701100ljp.31.1566764381686; Sun, 25 Aug 2019 13:19:41 -0700 (PDT) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="cWoXeonUoKmBZSoM" Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Mailing-List: archive/latest/17183 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/20190825201938.GA13907@mitya57.me Approved: robomod@news.nic.it Lines: 62 Organization: linux.* mail to news gateway Sender: robomod@news.nic.it X-Original-Cc: debian-python@lists.debian.org X-Original-Date: Sun, 25 Aug 2019 23:19:38 +0300 X-Original-Message-ID: <20190825201938.GA13907@mitya57.me> X-Original-References: <20190825195005.GH1643@belkar.wrar.name> Xref: csiph.com linux.debian.maint.python:11669 --cWoXeonUoKmBZSoM Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Gu=C3=B0j=C3=B3n! On Sun, Aug 25, 2019 at 10:01:02PM +0200, Gu=C3=B0j=C3=B3n Gu=C3=B0j=C3=B3n= sson wrote: > I did follow the procedure but I don't know what to do if a patch > doesn't apply cleanly. > I did try > gbp pq import > gbp:info: Trying to apply patches at 'c72f39a3a32b5e5c1eb7f9aaf7176e942e8= 5d804' > gbp:warning: Patch 0004-remove-logo-privacy-issue.diff.patch failed to > apply, retrying with whitespace fixup The correct procedure is running =E2=80=9Cgbp pq import=E2=80=9D *before* i= mporting a new tarball. Then after importing you do =E2=80=9Cgbp pq rebase=E2=80=9D. Sometimes I myself forget to run =E2=80=9Cgbp pq import=E2=80=9D. In this c= ase I do the following: - Remember the current commit SHA1; - git reset --hard origin/debian/master; # or to previous tag - gbp pq import; # this is the needed step - git checkout debian/master; # back to debian/master branch - git merge COMMIT_ID; # that you remembered before > 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. -- Dmitry Shachnev --cWoXeonUoKmBZSoM Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEE5688gqe4PSusUZcLZkYmW1hrg8sFAl1i7VYACgkQZkYmW1hr g8vEsw//WnXN25Z+un7grcZtnQibpjGJ9mDsG348Voq4QOqjaLDHtvzvNLbFf9jD LX/Sney7/ValyIxK7mDYyWR5y0IuNa06S5XVzPr+L/L6+IQGBIHDheS6Ajuw9I0V g7F1AW5E2nOWNQ4DnQdgLjnlMmFMqsjhN3Z9ln0PGQV6FNNKFIee1/dQQVf+XFw4 sYjxMK3eKqA++fHuTkKb93+0Fe/0PfnfWQUlRlyOnN6XmKYgUy2Tdy1t3QN1mp7W DJqRDIdDjv4+OabL3onFoPH/Py0uYMCoFm8zy++KVmhWV5IPoFPzZpc50FQ51gXC WAb9Cw2ZPLDkuNHawvMRY6DgehHzh5x/szNvWdifd98eYXTNcgYhYS1/DWtrj4jX RcvpVI8rwOX6QARMRg1fJrMd5x6Q7ixN7uNTGdbTp/0gWQMJbuogG9Ltep7EFSXz 7m8LE97qEV9ZDPVdKzdmDqpdGVKi2JuhBoJZe/7WVGjuBmyq2xrxjpi0HvvBbjIj QQBQemaX559phKB8Irh8ODppq3GUxctUMBzlyucgF8PwL1q9Y3s0ySld4USX5Zum r/l2Uyqqfmht8RT2KzmXaZq6LEUwOP5zPXn4+i0o04tjW821mprn2csiBvvgkJsa b5ID984wQHAfj2g3vfzfNiuBogNZWZwc0+SrfmGDspxmFcMIkf4= =duYF -----END PGP SIGNATURE----- --cWoXeonUoKmBZSoM--