From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id iD9/NpvqI2a+twAAe85BDQ:P1 (envelope-from ) for ; Sat, 20 Apr 2024 18:17:32 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id iD9/NpvqI2a+twAAe85BDQ (envelope-from ) for ; Sat, 20 Apr 2024 18:17:31 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=EWF7wpVc; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1713629851; 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:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=R5V6wB/hXnxMPdSYQ4MOwn9Gb98YqhF8LpBtsIMpHl0=; b=c88Iecubc/YUN9RydAsU46si/LJop5yA+FuB5LHd4WyEFoRK1nfmQ9AbMn1hKEVd7fZkyH 71FlwOvZBRFVUlAWsvZ/ztNMyVXY8XB71BbbRIkcJ8C6AbMFFPMrOvouGC3ZsHvfj0bclb piRPZGiW7TgbaW3SA20RybpEhxZkHyd1t5ixtyaLYIa+P8X8dBLdKnGQWPuDq0HMJiWPoG aBLQfLQG7GjByj6C2tNwUOaCHSv6GpJL9i2Q5VPnNA/YLC57wEl3jBLYhPFAoyGRGX96d9 cj0/vg87n8b+jyvDUAIApZTozixYsg1EajzVi7YXe9UcvPl6dR+vAzR/dwoYAA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=EWF7wpVc; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1713629851; a=rsa-sha256; cv=none; b=MKCu57KnjQ3GdmlctbAmjpHOANKFMZCjlplCqSnkQhaO6J7oYHuExsEI5tDu2zOv9kn6Y5 P8Iz9DGH7o+RQ9PWaK+/pyRmlEwslHT3rR+Y1ZwfdCLLeHML4qR4v6Ir5TGlqpLL0kErMl pJPxN0OfvEXkfxFjgrYV9POn28SYoBScAVBp5Bt36PN+z2qMlx1zs+P8G9NW6QpdmhywPG 9nfIuJfihkBOX5AQfNkRN/phqG3K9rFt1yZJApkzY8lvCVPKDwi7VXMHe6wJY0k8I2vZ4X H9Gcl5nYyXfHxLH5R+n0z/uS6peV4vO5K5NMg8R9m8aBjampSp52IJngcHV07A== 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 82F193BBC4 for ; Sat, 20 Apr 2024 18:17:30 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ryDOi-0000IL-7b; Sat, 20 Apr 2024 12:17:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ryDOZ-0000I2-Q8 for bug-guix@gnu.org; Sat, 20 Apr 2024 12:16:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ryDOR-0000lM-IB for bug-guix@gnu.org; Sat, 20 Apr 2024 12:16:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ryDOg-0000Ux-44 for bug-guix@gnu.org; Sat, 20 Apr 2024 12:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#70456: Request for merging "core-updates" branch Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 20 Apr 2024 16:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70456 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Christopher Baines Cc: 70456@debbugs.gnu.org, steve@futurile.net Received: via spool by 70456-submit@debbugs.gnu.org id=B70456.17136297911783 (code B ref 70456); Sat, 20 Apr 2024 16:17:02 +0000 Received: (at 70456) by debbugs.gnu.org; 20 Apr 2024 16:16:31 +0000 Received: from localhost ([127.0.0.1]:37028 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ryDO9-0000SN-0o for submit@debbugs.gnu.org; Sat, 20 Apr 2024 12:16:30 -0400 Received: from mail-qk1-x735.google.com ([2607:f8b0:4864:20::735]:60873) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ryDO6-0000RS-OS for 70456@debbugs.gnu.org; Sat, 20 Apr 2024 12:16:27 -0400 Received: by mail-qk1-x735.google.com with SMTP id af79cd13be357-78f05e56cb3so186260685a.1 for <70456@debbugs.gnu.org>; Sat, 20 Apr 2024 09:16:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713629766; x=1714234566; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=R5V6wB/hXnxMPdSYQ4MOwn9Gb98YqhF8LpBtsIMpHl0=; b=EWF7wpVcWx0zl2UjeaN7mYcFil7h1VDRSjlwfmO8alsex6gp7+/2ObVRCT8SZc2Ecr Ck2DkglcjPjyAfMMS/xD6WQRZ5jmSgnBiyD1pFiNZ6+E7uyiQOs1zuzCKU+7am7R4uw3 tmsZLEOSFrtYjbLltYXiU4DpvMMbwwJ6uimdClRpj5EE39wXxh1n4WQ23xJ2na/2lu5W pW7XdX4mWhlTajWnqT5zbGMHv/2wlhuB3socp6t2SunYlFLQzlSbfshnDEqSP4BOuiO7 0U8wrfhkTo3gDBDAcQTFicvN/dgaCLZORrTObu8nSlL9opDCSVd9TE+pcOmifhqTME4+ u9tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713629766; x=1714234566; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=R5V6wB/hXnxMPdSYQ4MOwn9Gb98YqhF8LpBtsIMpHl0=; b=DO/f7YXYiSb1fLhMQ+3PRops9hsRU52J12iZiezCi0eZDYOEspwS82fkpui5DBzJqx pF5pAhflNSItv14sgBDFuwRtFVvShUw37HYRnkXx9XMGOT3oUaFGr5LQYhbukMUhmLm6 HCIianZ1kNAPuA6nZP1MRfGn7sEvVhYsIqV03Kc/KM8tSXnaaYyRhQPdjK5ZTBfFIsGY c0QylOILxv2qxiuuE6iaoEl3J060DfIBD0WO5jG5BcGyKyFy5HcG0bXWD4tNTEwWVi21 fIknIRBbXEJ961AGVaKDq410zN0pcEDaQFHBDD1BReMTjG7odBJVLf26TKMMdZkTUi0h eqJw== X-Gm-Message-State: AOJu0Yxt/6U2H2Pp8j3uHbUX8PQlBtacGZlqwmXHWADBRcYDeM0MMjVy c6VH/HQNzRklJW6Wkx1aX9lBx+kEzxd6dgkzgxwPrq/s3ioc+vVF X-Google-Smtp-Source: AGHT+IFr+0PpDG5kccTxjeW9NtnVKjhAd61Wf9cAIkuWfdXMX/5UxB9F1OEzOLoUCIxzxYJ6+clcvA== X-Received: by 2002:a05:620a:1d93:b0:78d:65bc:d83e with SMTP id pj19-20020a05620a1d9300b0078d65bcd83emr5822972qkn.18.1713629766146; Sat, 20 Apr 2024 09:16:06 -0700 (PDT) Received: from hurd (dsl-10-134-76.b2b2c.ca. [72.10.134.76]) by smtp.gmail.com with ESMTPSA id k6-20020a05620a07e600b007905e4a1ae1sm1132366qkk.96.2024.04.20.09.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Apr 2024 09:16:05 -0700 (PDT) From: Maxim Cournoyer In-Reply-To: <877cgt47a1.fsf@cbaines.net> (Christopher Baines's message of "Fri, 19 Apr 2024 18:00:22 +0100") References: <87il0d4dn0.fsf@cbaines.net> <877cgt47a1.fsf@cbaines.net> Date: Sat, 20 Apr 2024 12:16:03 -0400 Message-ID: <87bk64j9h8.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.28 X-Migadu-Scanner: mx11.migadu.com X-Spam-Score: -5.28 X-Migadu-Queue-Id: 82F193BBC4 X-TUID: I7HX6kWb2/Kf Hi, Christopher Baines writes: > Christopher Baines writes: > >> I'm also really confused by what commits appear to be on the branch, >> take 12b15585a75062f3fba09d82861c6fae9a7743b2 which appears to be one >> core-updates, but it's a duplicate of >> e2a7c227dea5b361e2ebdbba24b923d1922a79d0 which was pushed to >> master. Same with this commit 28d14130953d868d4848540d9de8e1ae4a01a467, >> which is different to f29f80c194d0c534a92354b2bc19022a9b70ecf8 on >> master. > > I've worked out at least when these two werid commits turned up on > core-updates. > > 12b15585a7 is mentioned here: > https://lists.gnu.org/archive/html/guix-commits/2023-09/msg00955.html > > and 28d1413095 is mentioned here: > https://lists.gnu.org/archive/html/guix-commits/2024-03/msg00381.html > > > With the changes last month in March, I was going to suggest deleting > the branch and then re-creating from f205179ed2 and trying to re-apply > the changes that should be on core-updates, while avoiding any > "duplicate" commits. However, I'm not even sure where to being with the > ~5000 commits pushed in September, at least one of them is a duplicate > of a commit on master, but I'm not sure how many of the other ~5000 are. > > For comparison, I did a merge of master in to core-updates today, and > this is what it shows up like on guix-commits: > > https://lists.gnu.org/archive/html/guix-commits/2024-04/msg01209.html > > There are only two new revisions, the ed update I pushed, and the merge > commit, which is what a merge should look like as far as I'm aware. I think probably what happened is that in the middle of a merge of master -> core-updates (which entails sometimes painful conflicts resolution), a new commit pushed to core-updates, and to be able to push the resulting local branch (including the thousands of commits from the merge commit) got rebased on the remote core-updates. Perhaps another merge commit appeared on the remote around the same time, which would explain the duplicates. While I agree it's messy to have 5000 of duplicated commits, I'm not sure attempting to rewrite the branch, which has seen a lot of original commits, is a good idea (it'd be easy to have some good commits fall into cracks, leading to lost of work). I'd rather we take this experience as a strong reminding that rebasing merge commits should be avoided at all costs (git already issues a warning, IIRC). As you suggested, the next time a situation like this happens (locally prepared merge commit with new commits made to the remote branch), merging the remote into the local branch is probably a nicer solution. -- Thanks, Maxim