From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id KE/4DbcOkmR58gAASxT56A (envelope-from ) for ; Tue, 20 Jun 2023 22:40:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id OBfzDbcOkmRSAwAA9RJhRA (envelope-from ) for ; Tue, 20 Jun 2023 22:40:23 +0200 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 1516EBDAF for ; Tue, 20 Jun 2023 22:40:22 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=FCuZlyLz; dmarc=pass (policy=none) header.from=gmail.com; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1687293623; a=rsa-sha256; cv=none; b=CQO2oNgHMrtOr/5udW5yZGl75xUzcdCWBPWwwXiYTltNLKiwRHYIyHhdKu/IsESWyHeuv9 pohMZmHxl0cnhNf5noul3RwXjT4dD9wgySutANcOHfsurmrLUycJM4hF8wWmh0xCS6r6uC s7nsJGvL3t0KE7nNGRgDIDgxIyukzB9H5Uph7YZjIYgl1f4WNwuK5xydeK5xztyabFZpFX K3jm/c4etAdQfWv1dIsJSDURWJisgkVoXBgJGedAAJlc5wTmoMNnGlBUKsDcZrGOhlVTvw mcQN2mssss+JuZb276NOT3ZhL74nQdzX1f68aYIZNsqIyx9i0Kxl/d2tv4ch/g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=FCuZlyLz; dmarc=pass (policy=none) header.from=gmail.com; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1687293623; 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=mWtCYb4j+DbN1CqGYxxQXtD3lS2imgduK/iA6KhnjKo=; b=YrTwI78aB4PIB/XHaY8WrKHwze7CN0IlHLbTzbwr0Mr+4CLqvCYGZ8HbSXvcXIcQzaNWeY NNFot2MqpiyjRnqqHYZtzSrTSTJolZh9DmYU/HqI3luOKuLCWVdwjPUidSIZ0LA4AahCA7 cA8PQLx1zmnwWyoRdcemMyeoO8lC5oKBz/9z/SOTweBM1McITqYG3VsE04/+5rXFdo/3Q+ 2G6DZ4y8PwoE7sNhwlVZ5jCZUwnExwLZnv1O4PpFqiio170n68q6gwhMKLEjr6O0gz8wC3 fRxPrDdaFrg7JG74cF8FxSr0RA+b9niLTShf+usHXz+KuCvgqXF/Xoz9GXIF1g== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qBi8c-0006MQ-EP; Tue, 20 Jun 2023 16:39:42 -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 1qBi8S-0006Ls-J8 for guix-devel@gnu.org; Tue, 20 Jun 2023 16:39:34 -0400 Received: from mail-qv1-xf34.google.com ([2607:f8b0:4864:20::f34]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qBi8L-0002sJ-7i for guix-devel@gnu.org; Tue, 20 Jun 2023 16:39:27 -0400 Received: by mail-qv1-xf34.google.com with SMTP id 6a1803df08f44-6300465243eso31949466d6.2 for ; Tue, 20 Jun 2023 13:39:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687293557; x=1689885557; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=mWtCYb4j+DbN1CqGYxxQXtD3lS2imgduK/iA6KhnjKo=; b=FCuZlyLzkGERmOGcM9DDeiN9zrnFcTXEtXLUrzUlPLA8tL0DwFBqjMCsVZFZcBt04G E0Cg8gSc+RcYb8Ruk7HG0gdlUCut+rNmHVMaobT7F7kcLkaD88zm38Uu7FBIHWP2S1n3 INaL0hDB7ZBWeaYcb0A7V/2HQ2ds7R+MQazmHwhfzdR8Xq6J0pD44jjun3KYHhTAWJXJ 9JjGwmGx12Xkdg/FGpPUBCs8V/2q98VKKXR3kciIineQCFzGLzCkoRB4rVu51nl2akuN obWUHWpMVuUNzWBHSkOErR1lkpvoztUvt7dlNw5SMyoFGYDwimmQJkpoofZuvJYOLkM/ XgJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687293557; x=1689885557; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=mWtCYb4j+DbN1CqGYxxQXtD3lS2imgduK/iA6KhnjKo=; b=cSzHsj2ps/u/Xmt6ZK6ui1YYde2+B2phW7BBncOCyjM3wF0s0YL8LG0lVIPbnrTS09 1CcZG9WZsJwsPXDPxIADJZObgznFXQoFljg84M3pXVKMbenUfYUCeX1XLjafkWRuoRZ1 8fxNYtdwdqLUSUMRE2p+JhC9p3xpC5dCrPvk1XUKlR2XpGzCZwjpYgHeGatsGrC9KMnb f07EHdHXPvs2/h9q6kAxRW5EPAItXtAQt579BGKPfK7mlWRi00or/S1Tvt946c1eyf/C LLrohcCuRTjUIDMJ57iQd4TVFo5le/UuvydExmUy4wLkNJlXLsEWb6tv8Jh1WeZ3pfXe HWng== X-Gm-Message-State: AC+VfDzscI1SYB38ipyxDkkceBoD3l0X5h+xASkxwLjv1hJcYFpoLFo3 E4Igrnv4N5RX6jVCVBc0iADONNrRiVE= X-Google-Smtp-Source: ACHHUZ7Qaxhh7G9yqEZbgzuW30R6yDsKD7eqB3tx0unprnsYm4ac6jp+vJDamDZ0VIFJkjwN5i9kMg== X-Received: by 2002:a05:6214:c27:b0:61b:7115:559e with SMTP id a7-20020a0562140c2700b0061b7115559emr16309210qvd.1.1687293557408; Tue, 20 Jun 2023 13:39:17 -0700 (PDT) Received: from hurd (dsl-159-194.b2b2c.ca. [66.158.159.194]) by smtp.gmail.com with ESMTPSA id f22-20020a0caa96000000b0062deea179aesm1643034qvb.22.2023.06.20.13.39.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 13:39:16 -0700 (PDT) From: Maxim Cournoyer To: Giovanni Biscuolo Cc: Leo Famulari , Felix Lechner , Andreas Enge , Christopher Baines , guix-devel@gnu.org Subject: Re: Rebasing or merging? [was: Re: 01/03: gnu: wxwidgets: Add libxtst to inputs.] References: <168610879676.2825.9044237296073582277@vcs2.savannah.gnu.org> <20230607033317.826FCC23EDC@vcs2.savannah.gnu.org> <87sfb31qqp.fsf@cbaines.net> <87wn0aadrb.fsf@gmail.com> <87352xady4.fsf@gmail.com> <87y1kp8q11.fsf@gmail.com> <87cz1yx1z2.fsf@gmail.com> <87352m12dn.fsf@xelera.eu> Date: Tue, 20 Jun 2023 16:39:15 -0400 In-Reply-To: <87352m12dn.fsf@xelera.eu> (Giovanni Biscuolo's message of "Tue, 20 Jun 2023 19:15:32 +0200") Message-ID: <87v8fh3m30.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2607:f8b0:4864:20::f34; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qv1-xf34.google.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: guix-devel-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -6.40 X-Migadu-Queue-Id: 1516EBDAF X-Spam-Score: -6.40 X-TUID: nzFg8YG9HpQz Hi Giovanni, Giovanni Biscuolo writes: > Hi Maxim, > > Maxim Cournoyer writes: > >> As discussed previously in this thread, a good policy would be to >> suggest avoid *both* rebases and merges during a feature branch >> development. This way we avoid both problems, > > I read the whole thread and AFAIU the (only?) problem with the "merging > master to feature branch" workflow is the one pointed out by Andreas [1]: > > > Well, we used to repeatedly merge the master branch to core-updates, > which if I remember well makes the master commits end up first in "git > log". So the core-updates specific commits gradually disappear below > thousands of master commits. So this is a problem. > > So, if I don't get wrong, the only problem is with "git log" not clearly > showing the commit that are specific to the feature branch: are we sure > is there no option that can help feature branch reviewers focus on the > specific commits? > > Is not "git log --no-merges master..branchname" supposed to do what we > need? Or "git log --first-parent "? (not tested) I'm not a 'git log' expert myself, but intuitively like you, I'd expect the --no-merges one to be useful to hide merge commits! The doc seems to confirm that: --no-merges Do not print commits with more than one parent. This is exactly the same as --max-parents=1. Thanks for finding that option. >> and if the branch is short lived, it should be bearable that is isn't >> synced with master for its short lifetime. > > What lifetime is short lived in Guix context? 5 days, 3 weeks? I'd say anything shorter than a month is (relatively) short lived, yes. > Anyway, I'm not sure that the branches designed on Guix (i.e. those > listed on https://qa.guix.gnu.org/) will be short lived, I guess some > could be long lived (months instead of weeks) I'm not sure too, but the idea is that when a branch is merged it should be deleted to communicate that, and that branches should be short lived (feature branches). Perhaps we'll find out that we still need more longer term integration branches that require synchronization; we'll see! -- Thanks, Maxim