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 10:41:46 +0300 Message-ID: <864j95a9j9.fsf@gnu.org> References: <86sewpahi8.fsf@gnu.org> <868qyhad0n.fsf@gnu.org> 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="33067"; 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 09:42:43 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 1sPH74-0008Nw-A6 for ged-emacs-devel@m.gmane-mx.org; Thu, 04 Jul 2024 09:42:42 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sPH6C-00068m-KK; Thu, 04 Jul 2024 03:41:48 -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 1sPH6B-00068T-Qy for emacs-devel@gnu.org; Thu, 04 Jul 2024 03:41:47 -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 1sPH6B-00042l-Hs; Thu, 04 Jul 2024 03:41:47 -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=njL++Mm7l0org3VU58jY24pak//TlJ+u3d3uu93j060=; b=qbjkm4z/siXA7+PyEiGZ tnV5Ap9gxeuc6INxHa3P8UraTKhSqT0OaSZtI3I9VK+OYwVqw7KW+/44vupOP+ipmxUH8Ju2wnihM QsZgXK4o8LJdEjjU6ggeS0us7WmGbP7Y7vICLoR20fD51PkRtbdHAXYX6ldrd5LEbyWN9FJRizQVn dAMMTFGZhq37mUxpx7YZU8XYp9lpFIk1glM1g48hgLHlWaLKj5Fo7zbsWJuHY4SQNUCCwbOz2hd31 EnTl6f8AhAf3cCaAO1ZwA82RaoGqCzJkGtxp0IK64k6JNMmH0HttGFyoL0m+eFzo9XSOSoStk7JrD EjkoRWCAjRci5g==; In-Reply-To: (message from Gerd =?utf-8?Q?M=C3=B6llmann?= on Thu, 04 Jul 2024 08:55:52 +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:321309 Archived-At: > From: Gerd Möllmann > Cc: acorallo@gnu.org, emacs-devel@gnu.org > Date: Thu, 04 Jul 2024 08:55:52 +0200 > > Eli Zaretskii writes: > > >> The commits before the merge don't need new new commit messages. So, > >> there's is no interactive rebasing required. The commit message of the > >> merge consists of a change log entry describing all effective changes > >> between master and igc at that time (it describes the diff at that > >> time. > >> > >> Right? > > > > Yes. > > Thanks. > > Whoever does that in the end is a poor soul. Not really, it's a relatively simple task, even for very large merges from a feature branch. For example, all the stuff in igc.c needs just one entry: * src/igc.c: New file.