From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id EHcyLf0LqF/6EgAA0tVLHw (envelope-from ) for ; Sun, 08 Nov 2020 15:17:17 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id kNfxKP0LqF9jRAAAB5/wlQ (envelope-from ) for ; Sun, 08 Nov 2020 15:17:17 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7B9689402A0 for ; Sun, 8 Nov 2020 15:17:17 +0000 (UTC) Received: from localhost ([::1]:49936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kbmRQ-0005R9-9h for larch@yhetil.org; Sun, 08 Nov 2020 10:17:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57634) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kbmQw-0005PL-Np for guix-devel@gnu.org; Sun, 08 Nov 2020 10:16:46 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:50276) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kbmQv-0005Z2-Bh; Sun, 08 Nov 2020 10:16:45 -0500 Received: from host-37-191-236-253.lynet.no ([37.191.236.253]:34886 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kbmQt-0004yL-TO; Sun, 08 Nov 2020 10:16:45 -0500 From: Marius Bakke To: Pierre Neidhardt Subject: Re: branch master updated: gnu: nyxt: Update to 2-pre-release-3. In-Reply-To: <87lffcyynb.fsf@ambrevar.xyz> References: <20201020130843.10939.42161@vcs0.savannah.gnu.org> <87ft5lgdmn.fsf@gnu.org> <87d00pgdbz.fsf@gnu.org> <87lffcyynb.fsf@ambrevar.xyz> Date: Sun, 08 Nov 2020 16:16:40 +0100 Message-ID: <87tutzg9pj.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: guix-devel@gnu.org Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Spam-Score: -3.61 X-TUID: 4SNgSbxzKFSl --=-=-= Content-Type: text/plain Pierre Neidhardt writes: > Hi Marius! > > Sorry about this! :( > >> If you happen to be around right now, can you confirm that there were no >> changes to nyxt inputs in 573489fbcd68e3a89cc5c9c66693d3689b1b88bf? > > I don't have a Guix checkout at hand now so I can only tell you tomorrow. > Did you manage to fix the merge conflict? The merge was resolved in 32787d652460871a79f99b63230f92759e2e0de2. > Otherwise go ahead and I'll fix the Nyxt recipe when you are done. Great. I verified that Nyxt builds on 'staging', but have not tried running it. > Out of curiosity: how do commit messages help you here? It can be difficult to tell from the diff alone which inputs are native, regular, or propagated. Often when merging, I need to look at the conflicting commits multiple times. Having to deduce the changes every time carries a mental overhead that is eliminated when I can compare the diff against the commit message. In this particular case I ended up writing down the changes for each conflicting Nyxt commit (21e792, c5d9cd, 573489). The latter was especially tricky because it changed the indentation, but ultimately I found that it had no input changes (by comparing line-for-line). > Is there an automated way to report the inputs changes from the > comment message? I'm not sure what you mean, can you elaborate? > Sorry for the troubles! No worries. :-) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFDBAEBCgAtFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl+oC9gPHG1hcml1c0Bn bnUub3JnAAoJEKKgbfKjOlT6MCsH/28lcvzE8XrqVV9v4Pp3s97NXuG48OmlLjlG RvjAdEgOnBC+5LIYqSbQarutF/dVirL/u603HiQtPZYFDnBYs1+Uf7W4GUDxJZQL 9bWPCJac+kgD2NZfJv2yBC4zKuNaQNgn/2gvuqgFy9/IGjpVq1UxPkXv3hD0yysL fIlWvd/Jmklu7p0/bZgpGj0iHmekCd+jFr0pdgSPqmenxQgM7kEx4bnmrNtBpEzn RKnucGu5clDd9MDJBjGy1GxrHo9LAxsLCR1WulLVi1MP0DcZ1BVLqJPSlLfVECtH vKl7l4w7qnuGjmi+SjeRlF6JyETv4XxfqHpYhX+rBVWhyft5bxM= =bpeU -----END PGP SIGNATURE----- --=-=-=--