From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?utf-8?Q?K=C3=A9vin_Le_Gouguec?= Newsgroups: gmane.emacs.devel Subject: Dealing with merge noise (was: Merging release branch) Date: Sun, 31 Oct 2021 17:02:41 +0100 Message-ID: <87pmrlp4gu.fsf_-_@gmail.com> References: <87bl37vg9l.fsf@gnus.org> <87y26bu0ih.fsf@gnus.org> <83pmrnppqy.fsf@gnu.org> <874k8yspb4.fsf@gnus.org> <835ytepvad.fsf@gnu.org> <51ab9b37-7c1b-0b71-4875-265ac402a756@yandex.ru> <83lf2ao4jz.fsf@gnu.org> <04203f394658f284d78b@heytings.org> <83ee81oe2n.fsf@gnu.org> <9b18f0c1-0dc0-9c88-a6e1-df3aa5d4a94b@yandex.ru> <87zgqpntfm.fsf@gnus.org> <83wnltmdn3.fsf@gnu.org> <87h7cxns3u.fsf@gnus.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="10024"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: Eli Zaretskii , emacs-devel@gnu.org To: Lars Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Oct 31 17:07:27 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mhDMk-0002RX-31 for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 17:07:26 +0100 Original-Received: from localhost ([::1]:32812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhDMi-0008Hh-LL for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 12:07:24 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:52018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhDIE-0003Ez-Sm for emacs-devel@gnu.org; Sun, 31 Oct 2021 12:02:46 -0400 Original-Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:41646) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mhDID-0007Q8-AX; Sun, 31 Oct 2021 12:02:46 -0400 Original-Received: by mail-wm1-x329.google.com with SMTP id f7-20020a1c1f07000000b0032ee11917ceso6533598wmf.0; Sun, 31 Oct 2021 09:02:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=lrZlJMISZV+S3h03PKeZN7z/7ky6+xNMI8B0P2SARKo=; b=SfLSSKmyEKavinp9m/Ij+YPgKbT6PuBifG1Bnxwbgb3V54hm96Vm3vvggWjGf1jjBW bQVAygPYOr+F+ULzfD5RoFcv8W2Tfq3NRg2I4gfrjURMYIjzFuCy7hGG2EbdSmbCBa8f fVqLznXkyy2Ba0xHOxrW5dgUUxkfRsKQ2cjEzD/XbTqLLO9Jr8w8Jf/BlWtkheUNGum0 9u0l4xcwElVkWvnqPdRptodFSTwy3g99bp/LvqMuICIJa4s4z7p6GacSV9BBiapqsuMd lEuaMfXt5wb1WDc/9yvKwJiY0ZYJAQ6rUosgOx1LM9hdOIKHL99u1brbko4RivnwnPkh Ux6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=lrZlJMISZV+S3h03PKeZN7z/7ky6+xNMI8B0P2SARKo=; b=P/vrDE+jr0HQXSDON58UXJLlL6mIX5cLYZb2bcAnoIW8cawB0MdXC1dp+iWU1zRzFB bRYqlNI63Pi6ii4CuvbnyUJreYkCzCsABNf9DyzBcTxpzKDZUTmh5cD0DRHRFUtya1Ns znrBJry54qt5qbeXUzS64Ktkgm3LCUDL4i4oIegkbzV00UH+Su1TN1G3lj42OCY6Heq8 YGpZhfkh04bVzoKSxGyphqOgoUSxJ588TXBsAtUqmTs72bA21b1ASVQaNwL2m5r/5bNw E4jx17PWnPh+i2hlGn6S4xrf5Nl5TA16rbDBQ7rpG6y9vzyMNiLg1393LXoTAlIHfIOL ejEQ== X-Gm-Message-State: AOAM533a/DNfuUbBxGvoC93YIfHT1wsqxz51SJbFjovCjuh9qslmAdgo KH0avzN9wFvRqdA3eAeET6dDhOIh0bA= X-Google-Smtp-Source: ABdhPJwO9sV9R7UsV+Jy/WzxaFodp5ZPg3ZC6t42cJTnAPchl/R/c1zI6zWNyCFMV/pK+hXiVBVlXQ== X-Received: by 2002:a1c:7c19:: with SMTP id x25mr21731563wmc.42.1635696162362; Sun, 31 Oct 2021 09:02:42 -0700 (PDT) Original-Received: from amdahl30 ([2a01:e0a:253:fe0:2ef0:5dff:fed2:7b49]) by smtp.gmail.com with ESMTPSA id x21sm13630916wmc.14.2021.10.31.09.02.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Oct 2021 09:02:41 -0700 (PDT) In-Reply-To: <87h7cxns3u.fsf@gnus.org> (Lars Ingebrigtsen's message of "Sun, 31 Oct 2021 16:15:01 +0100") Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=kevin.legouguec@gmail.com; helo=mail-wm1-x329.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:278316 Archived-At: Lars Ingebrigtsen writes: > Eli Zaretskii writes: > >> We've discussed this long ago and decided we didn't care. The master >> history cannot be clean anyway, because when there's a race between >> two committers pushing at the same time, one of them will look like a >> merge from a branch. > > Not if the committers rebasing (which I do), but we've already been over > that. :-) (Not sure if this was suggested in past discussions, but maybe sticking "--no-merges" in vc-git-log-switches can reduce the pain somewhat?)