From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Moving etc/NEWS around causing release branch merge to fail again Date: Wed, 14 Dec 2022 18:01:22 +0200 Message-ID: <83k02um0tp.fsf@gnu.org> References: <83mt7x22gs.fsf@gnu.org> <83fsdiodld.fsf@gnu.org> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="26066"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Stefan Kangas Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Dec 14 17:02:19 2022 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 1p5UD4-0006YU-RU for ged-emacs-devel@m.gmane-mx.org; Wed, 14 Dec 2022 17:02:18 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5UCG-0002XC-F0; Wed, 14 Dec 2022 11:01:28 -0500 Original-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 1p5UCE-0002We-9m for emacs-devel@gnu.org; Wed, 14 Dec 2022 11:01:26 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5UCD-0008EK-Ur; Wed, 14 Dec 2022 11:01:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=Bke5UH4vMaqMpVzIMlsG/IB1Jku/1MKS0PUtoeD/6Bo=; b=hp8AuNjySqOc f56611yuEkUqQPmEwKd4Xih/OxEqHcVhyieG/kt1AcSCXMbKS086oE6F0J0sMjFEmsI6xi4tFJujU I9OXgKI3eAMpwbR93QcLSmxG06mUu2DpY0uSoI7QymQy/pPlXNaFhEgyGITtHBuSTOVHD2GnXyTvk 9kpds4U+ODqIgtCAXkIS5myK0BViz8cJ2ROOW/w9/mvurqkh4Vd+DOwapW4WegEpsDRzwHLI2vA06 717EjvVagx9tbY2aiQG+KEVP9EkbVuJoElZej2aeVmHQR0+YdaxIt3raIEGeBoeS2lyHZJbAGogJw pTRfpMQaTwcZKEs7n3iq6w==; Original-Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5UCD-0003cA-DE; Wed, 14 Dec 2022 11:01:25 -0500 In-Reply-To: (message from Stefan Kangas on Tue, 13 Dec 2022 21:32:41 -0800) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 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-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:301396 Archived-At: > From: Stefan Kangas > Date: Tue, 13 Dec 2022 21:32:41 -0800 > Cc: emacs-devel@gnu.org > > Eli Zaretskii writes: > > > What happened, exactly? Please tell more about what you saw. > > I saw the automatic merge fail with this error message: > > etc/NEWS has been modified I looked at what gitmerge.el does for NEWS, and I admit that I'm confused. AFAIU, it does this: . use "git diff" to write the diffs for branch/NEWS to a patchfile . use "patch" to patch master/NEWS.29 using patchfile . delete patchfile . "git add master/NEWS.29" So far so good, but then it also does this: . "git reset -- NEWS" . "git checkout NEWS" Why does it do that? AFAIU, these two commands _can_ produce changes in master/NEWS. > After a merge from the release branch (emacs-NN) to master, the etc/NEWS > file should never be modified. Only the etc/NEWS.NN file should have > been modified. Otherwise, it needs to be fixed manually. > > See also these lines in admin/automerge: > > ## FIXME it would be better to trap this in gitmerge. > ## NEWS should never be modified, only eg NEWS.26. > git diff --stat --cached origin/master | grep -q "etc/NEWS " && \ > die "etc/NEWS has been modified" Right.