From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 8B8eO1vt5WGA4QAAgWs5BA (envelope-from ) for ; Mon, 17 Jan 2022 23:27:39 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 6E9EOFvt5WHLOQAA9RJhRA (envelope-from ) for ; Mon, 17 Jan 2022 23:27:39 +0100 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 A60EC106D1 for ; Mon, 17 Jan 2022 23:27:39 +0100 (CET) Received: from localhost ([::1]:39562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9aTS-0004lT-Gc for larch@yhetil.org; Mon, 17 Jan 2022 17:27:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9aSH-0004k0-OU for guix-devel@gnu.org; Mon, 17 Jan 2022 17:26:25 -0500 Received: from out2.migadu.com ([188.165.223.204]:19273) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9aSE-0005qp-TC for guix-devel@gnu.org; Mon, 17 Jan 2022 17:26:25 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kyleam.com; s=key1; t=1642458376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=0BSNzgL/AdW4UxpJXFUW8LGLcmOgTr+66MJ63LCgPGU=; b=HV8s6SbVHT+lvOAjeHVLEsdiaLCx0s5LnrLAIqPVzLg5NRTjEXtj6zoOd8VHBbo8uxCUqb Xe9pqjZ+jdrWrZrgidRXQScHgybwZYmk9h05doqi+ihJ63H99ZSmU2toypm5uBSwcQoMKh gQYBiEY1iJj93i/u91LACJ9qIgPznuCDMzqfDw6izsRU1xfQxHss+E5xJmVn1E2475sZ9j 2axlIsHTOaZ9yg0Njve3CNATOKXr92X3lHpG0VKiZcMG0Loijt0mq4ZVl5yzfCGaomYTVl r5HYEer5ChpXbZsY1hwwl+ygJ4yekRUUbkVSTClFrFBwbWL99U8F6knuOA1kjw== From: Kyle Meyer To: Leo Famulari Subject: Re: WARNING: Git merges are tricky. Rebasing is better? In-Reply-To: References: Date: Mon, 17 Jan 2022 17:26:08 -0500 Message-ID: <87fspmngn3.fsf@kyleam.com> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=188.165.223.204; envelope-from=kyle@kyleam.com; helo=out2.migadu.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.29 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-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1642458459; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=0BSNzgL/AdW4UxpJXFUW8LGLcmOgTr+66MJ63LCgPGU=; b=Ock2dBIx9b62npS78S95mHEvVduJ+3/phjNqDQKA6dWXsVAc+dvU1A5KnuZjUPmUhzVD9n XOlZHcdLXKl7YHGp4UzBG+Vqr8NhvLd+46AVGnjcwFrAAuRK69uJUcA1eaCbYsFICuEijz HXeZOqWUlDNGGR+1B209FKRthMp+bYNzH6CMfeEA6X7hPqJPJYnvYiHaNXhBG06AUXyBJw +q1XXCtLMeyRWBeScG9fT1PXZ9MKH7IeZyGWrT03OXgGZEovhl1JBbd/jNno8jBqUesDle pDOBrhSAOi6o0cKPqOH+FFmIB+UF4dUJ3gvmICQsPAI7mmkYc4A8UPT2IB/Jig== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1642458459; a=rsa-sha256; cv=none; b=lrKDr/lSqBGdoPcJIbsv4OjI5pjMOfz9vo66uHJHlVqZgjrh5rnzpeTbPtkdbmntaelK9r IAJhD1CSspOITvGZ+Vny5on1eph35dMPigMxl6NeO/Vm5QN8Bq9PCVF3vXmTnMxUAQ3dvb EtKmns3il6XIgoKLR/aYfBzE9plXBpP58b6AJK9W4JWE3bZZFX7XIXSyUseUJ4QFX9WFZO OVixyxBfZI+wSEdMjBQw/JyBKDrQCTxxGiMgVSm3E8UUkVnftXYf1TDUMi8dpzDh7KojXu CSf1PDd2mfxD7HQUcQz1BcgCKvf1ZOYCVWns8xKUhJd5Dc2AcpVLqbPNDAeVDg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=kyleam.com header.s=key1 header.b=HV8s6SbV; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.82 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=kyleam.com header.s=key1 header.b=HV8s6SbV; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: A60EC106D1 X-Spam-Score: -2.82 X-Migadu-Scanner: scn1.migadu.com X-TUID: +sdEkeyaUeb9 Leo Famulari writes: > ------ > $ git show 276f40fdc349d2ad62582b23ea55e061b689cfc0:gnu/packages/gnome.scm | grep "define-public epiphany" -A11 > (define-public epiphany > (package > (name "epiphany") > (version "41.2") > (source (origin > (method url-fetch) > (uri (string-append "mirror://gnome/sources/epiphany/" > (version-major version) "/" > "epiphany-" version ".tar.xz")) > (sha256 > (base32 > "0r7m34xzz3shdfxf2abxb069izak3yv3ijlg29qy4pfmyawkilfs")) > ------ ^ > *This is the hash of Epiphany 40.3, the old version!* > > Git's automatic merge conflict resolution algorithm did the wrong thing > here. And Git does not show the reversion in `git log`, hiding it from > review. > > My guess is that commit f7afefba0 ("gnu: epiphany: Fix build with > libportal-0.5."), which happened on the master branch while the > version-1.4.0 branch was forked off, made Git think that this line was > more "up to date" on master than on version-1.4.0, causing it to select > the old hash when faced with the conflict. Fwiw I don't think Git automatically resolved that conflict: $ git checkout 276f40fdc349d2ad62582b23ea55e061b689cfc0^ $ git merge 276f40fdc349d2ad62582b23ea55e061b689cfc0^2 $ git status -- gnu/packages/gnome.scm HEAD detached at b2f6b6f6b9 You have unmerged paths. Unmerged paths: both modified: gnu/packages/gnome.scm no changes added to commit $ git diff -- gnu/packages/gnome.scm diff --cc gnu/packages/gnome.scm index d8d34c89ed,6c63b8bc59..0000000000 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@@ -6433,13 -6415,10 +6421,12 @@@ supports playlists, song ratings, and a name "-" version ".tar.xz")) (sha256 (base32 - "0ddjwcd77nw0rxb5x5bz5hd671m8gya9827p8rsnb58x103kpai8")))) + "0ddjwcd77nw0rxb5x5bz5hd671m8gya9827p8rsnb58x103kpai8")) + ;; XXX: Remove when upgrading to 42.0 + (patches (search-patches "eog-update-libportal-usage.patch")))) (build-system meson-build-system) (arguments - `(#:meson ,meson-0.59 ;positional arguments error with meson 0.60 - #:configure-flags + `(#:configure-flags ;; Otherwise, the RUNPATH will lack the final 'eog' path component. (list (string-append "-Dc_link_args=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib/eog")) @@@ -6798,9 -6776,8 +6784,17 @@@ a secret password store, an adblocker, "epiphany-" version ".tar.xz")) (sha256 (base32 ++<<<<<<< HEAD + "0r7m34xzz3shdfxf2abxb069izak3yv3ijlg29qy4pfmyawkilfs")) + (patches + (search-patches "epiphany-update-libportal-usage.patch")))) ++||||||| d91de53caa ++ "0r7m34xzz3shdfxf2abxb069izak3yv3ijlg29qy4pfmyawkilfs")))) ++ ++======= + "0k7b22zq3z1kllzqxgwsvwb1lp0j6rjb3k1hvhna3i573wc4mpji")))) + ++>>>>>>> 276f40fdc349d2ad62582b23ea55e061b689cfc0^2 (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t