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: scratch/igc as feature branch Date: Thu, 04 Jul 2024 07:49:35 +0300 Message-ID: <86sewpahi8.fsf@gnu.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="14758"; mail-complaints-to="usenet@ciao.gmane.io" Cc: acorallo@gnu.org, emacs-devel@gnu.org To: Gerd =?utf-8?Q?M=C3=B6llmann?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Jul 04 06:50:49 2024 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 1sPEQi-0003dp-GZ for ged-emacs-devel@m.gmane-mx.org; Thu, 04 Jul 2024 06:50:48 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sPEPf-000665-HJ; Thu, 04 Jul 2024 00:49:43 -0400 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 1sPEPc-000642-JX for emacs-devel@gnu.org; Thu, 04 Jul 2024 00:49:40 -0400 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 1sPEPc-0001ko-AH; Thu, 04 Jul 2024 00:49:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=vFwD4rLPoMVVvT+TfLLfxgUcbgNK9uxxVU1QOK1UW1k=; b=GAqHJVfiI6N3bVVKvJBg 5WZz9JOCTXAbtvGXrPY+As/ixRncWckn9ov8FSwEy1IDY1fxxISFL6lHFBSyoIqlu7KQOf0m7/B/m ScCVPsvrTTGOr31VatdXg00yFpYb3dcy9Q/0GbnNI5UuqzbIgov3/QAQp0Hu89gctBSl02ZCBSYa3 +6XvpEAugNS+T8jmrCO9RP8pPLTRFLcFpSmWZPxlKO7wcMvcinUFYPr5wzxgD65kxos5o4CTv9NmE Tyax8vkxcPwv+68RPHDkDtXN+Mm+fVOsDVLOr0KXWXTGI5giYknSuadFHX+KavIMeALCK2N+pzsf/ jfR21xSiK8IbQA==; In-Reply-To: (message from Gerd =?utf-8?Q?M=C3=B6llmann?= on Wed, 03 Jul 2024 21:29:49 +0200) 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:321296 Archived-At: > From: Gerd Möllmann > Cc: emacs-devel@gnu.org > Date: Wed, 03 Jul 2024 21:29:49 +0200 > > Does it mean that in the end, before merging, every commit must have a > conforming commit message? No, we only need to provide a commit log message that describes the changes wrt the revision before the merge. For example, a new file or a new function that saw gobs of commits on the branch needs only to be mentioned as new file or new function. Other places need to be mentioned as if all the changes were done in one go, and changes which were later reverted don't need to be mentioned at all. IOW, think about describing the merge "as if" you've rebased the branch onto master (I say "as if" because IMO actually rebasing is not a good idea). > Also, there are probably many hundreds of commits that are not in > scratch/igc at all, but only in my original. What's with those? If they don't affect the code after the merge, they don't need to be mentioned in the commit log message. Or did you mean something other than commit log messages?