From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pierre Neidhardt Subject: bug#38148: [PATCH 1/2] gnu: Add python-pyqtwebengine. Date: Tue, 14 Jan 2020 10:42:54 +0100 Message-ID: <871rs2z84h.fsf@ambrevar.xyz> References: <20191109100530.zdfrewfmengq7pud@hooch.localdomain> <20200113103304.9093-1-mike.rosset@gmail.com> <87o8v7qw5t.fsf@ambrevar.xyz> <87tv4yc1hb.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:60561) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irIj2-0001tq-2e for bug-guix@gnu.org; Tue, 14 Jan 2020 04:43:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irIj0-00021Q-Pj for bug-guix@gnu.org; Tue, 14 Jan 2020 04:43:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54691) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1irIj0-00021B-Lh for bug-guix@gnu.org; Tue, 14 Jan 2020 04:43:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1irIj0-0002EJ-JF for bug-guix@gnu.org; Tue, 14 Jan 2020 04:43:02 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <87tv4yc1hb.fsf@gmail.com> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane-mx.org@gnu.org Sender: "bug-Guix" To: Mike Rosset Cc: 38148@debbugs.gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Mike Rosset writes: >> Please apply the above pyqt change to a separate commit. > > I missed this comment with my new series. If this really needs to be > done, I'll have to redo all of the commits and resend the series. Can > this be avoided if possible? Yes, this is really necessary, commits must be atomic or else the log gets easily tangled. This is not hard to do though: =2D rebase-edit the offending commit ("r m" with magit), this will leave git in a detached state. =2D Soft-reset HEAD~. =2D Commit the first changes to a new commit. =2D Commit the rest. Let me know if you need more help. >> Use version-major+minor from (guix utils) instead? > > > This is not an easy fix, I actually snarfed this from python-pyqt. No problem, it's OK to leave it. =2D-=20 Pierre Neidhardt https://ambrevar.xyz/ --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEUPM+LlsMPZAEJKvom9z0l6S7zH8FAl4djR4ACgkQm9z0l6S7 zH9rKgf+MiXGEZHe59RkdQgssy4zcdt98wcQL7iJSK/6O5jxdL9KHHn8QgEloRif L4etpmU7jsK/9+pjZg9RAaYcERuHuY1qEo8H5qxqpmsuHwGuoLNjpFKY7vKCt2Ne erRiK5bPw5jImexXJOQj5kn0tUz9KwPvcRwQ7rIc5c3SQqSXFA0IUcLVi8lSpoK+ e1VgMRMLxtUs5P/P2++r+/cja73qt+e4293CFttvwy3pKHWKLjgnlEBEZU+cd9Ae iqKSGZUnyijAP6vw0MaAuzlKU9jHBLPbQRt3bS3pmjp0zS1As5QWerfHvE3FF8wV ghsS4jUlUwYQepsLYqfGTdn1GKwlxg== =T5p8 -----END PGP SIGNATURE----- --=-=-=--