From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Andrea Corallo Newsgroups: gmane.emacs.devel Subject: Re: scratch/igc as feature branch Date: Wed, 03 Jul 2024 18:04:16 -0400 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="20059"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 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 00:05:19 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 1sP86I-0004ut-Ug for ged-emacs-devel@m.gmane-mx.org; Thu, 04 Jul 2024 00:05:19 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sP85L-00042e-Lh; Wed, 03 Jul 2024 18:04:19 -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 1sP85K-000427-Nc for emacs-devel@gnu.org; Wed, 03 Jul 2024 18:04:18 -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 1sP85J-0007SE-C1; Wed, 03 Jul 2024 18:04:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=alHjyzsnF4c9gRBV26uruNjMSR+lypZ+SxomIz7SLoU=; b=nS0MKNU7cA7abY4kR2G1 zBRSkM0xSAKIDGJWoDeQc69zSI5ZaSw/r5LjZhoWLt0wVFoeMhOD1Rm3sfZHixoRB+BkzzsBPnaZ8 ODDHl1ft9WBfyQTOtLaF8A89s6HVZ0YDRLBGFn8hx9ElMamuheaU7jwaego5+auzkQ7Ice8NHFr23 f4G28al0IKIgzIYuOCun+lHE6nQp1X/J02h+SBqYj5P+Dzr7ShXox2QPehykk6Kxk95Oe+ZiA5O0D vrNsaWyyqWVgH1lKbyYG+7W144H2bmVtTkCv5T5/cYRz3SkibL/wYpfEknb7BrxT4KIFS8mlho15F jYBXXgyQ7Nh3Ew==; Original-Received: from acorallo by fencepost.gnu.org with local (Exim 4.90_1) (envelope-from ) id 1sP85I-0000Yy-HK; Wed, 03 Jul 2024 18:04:16 -0400 In-Reply-To: ("Gerd =?utf-8?Q?M=C3=B6llman?= =?utf-8?Q?n=22's?= message of "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:321287 Archived-At: Gerd M=C3=B6llmann writes: > Andrea Corallo writes: > >> - The fact that the branch is already worked with commits that will be >> directly mergable without having to do a mega rebase afterward. Also >> the mega rebase would cancel all or part of the history which I find a >> serious disadvantage. > > Hm, that makes me curious. > > Does it mean that in the end, before merging, every commit must have a > conforming commit message? I don't know if we have to be 100% strict on this, my opinion is that would be a pity to loose the history of the branch we already have, but others might have other opinions. OTOH given we know *now* that the goal is to try to merge, it would feel very weired to me to deliberatly ignore what we have in CONTRIBUTE as requirements for commits we are writing now and we know we want to include. > 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? We are discussing igc, how do these other commits come into play? Andrea