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?Gerd_M=C3=B6llmann?= Newsgroups: gmane.emacs.devel Subject: Re: scratch/igc as feature branch Date: Thu, 04 Jul 2024 08:14:24 +0200 Message-ID: References: <86sewpahi8.fsf@gnu.org> 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="7171"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: acorallo@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Jul 04 08:15:42 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 1sPFkr-0001eg-Rp for ged-emacs-devel@m.gmane-mx.org; Thu, 04 Jul 2024 08:15:41 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sPFjp-0005GC-D5; Thu, 04 Jul 2024 02:14:37 -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 1sPFjn-0005FF-BK for emacs-devel@gnu.org; Thu, 04 Jul 2024 02:14:35 -0400 Original-Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sPFjk-00048E-I7; Thu, 04 Jul 2024 02:14:34 -0400 Original-Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-a727d9dd367so20960266b.3; Wed, 03 Jul 2024 23:14:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720073666; x=1720678466; darn=gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sx4dLBNx9355rnO1Yqcr+Jty5PIEkd2lbbY7gRIG5jg=; b=Zmcu8WaWVxcTuS38Gag09lD/OENaU4v0WFdbkramWUQBiFWAdVkB3+AL9m5+tlXBqq CYmmeX0N5HhnzlyiWnOVXa+p8jakARaXldyUILsFX1Ai1+SLXl8QRn+xxGkreya3MPrT Kz1ve6eYezl4CfRz8C7Uc68y4bjUthurHwdVVLYJBOla8COJ0Ib+fYGTMgv/KmINiDE2 WwWgMmh1dfYIz7/wfahnO2F7CnCtREZm4jk23iOEWlmhAAu87eRpr5qKE2N8Ok9U141r m8POTXo3DG3TZJuNl36f4p7MN295ncyUJYk3djFgjtywL2SL2aCLLUR/wlVHeGcLjOuE CTvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720073666; x=1720678466; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=sx4dLBNx9355rnO1Yqcr+Jty5PIEkd2lbbY7gRIG5jg=; b=rpsoQCKQKn+OMlVlPxW/WBjD+TJ8nZgcx29Bq8yphJB/C5rdTM73eewPkzAKOlxfC8 6EI4i7WpMFULCoxYkjku7a0rOC6bG2ZHmQbqxI0+ZXNxFPgmSb/xJQvuM4e0Smpyzt+J L6UQfZ4v7HxToe+fwly0F3fxyPb6jnwU2O8peaH5TgNGPDSTaspx4ToFoDrsHeMs4Vqy BlSXInyGxV9QgxTvD6UbR+ClSgoOk61MtYGPj62k0dGkK+m/MtcSiEjkNjdWejyB3TL8 9doNrJXhXIzXYigHe9eAkiPbaoujLHkTyAFIaqJ/+OU9dEViVEDtMxKlG2DkJi/tTINe pPRg== X-Forwarded-Encrypted: i=1; AJvYcCWVUuo3WqUDkfAaAvcxYOIC5w6QisEwgrcf7ySEEq6LC+xIdhAupquxuPXDdpBEYweKkdRMGT0Suk1TOKZpzTRYMs8d X-Gm-Message-State: AOJu0YxGOb8OlG8BAuDuU/Dz5LCjLuqyNdExGOyFEJrbDyyI3aOuqkvJ 6Qyo5/cyjtF4OIeij+fh73d4Lyd8kFdCQCt8Xx2Z/8TqawFnsermxfM5yQ== X-Google-Smtp-Source: AGHT+IEskyaabsNa3dtqYhsDAi3bU2rWO1moYcROh4//rUY26MVPJkSLbkrmdcJJvbynHz0yRF5Yvw== X-Received: by 2002:a17:906:f24c:b0:a77:c080:11fa with SMTP id a640c23a62f3a-a77c080126amr5858466b.48.1720073665620; Wed, 03 Jul 2024 23:14:25 -0700 (PDT) Original-Received: from pro2.fritz.box (pd9e36fa8.dip0.t-ipconnect.de. [217.227.111.168]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72ab09028dsm575142266b.179.2024.07.03.23.14.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 23:14:25 -0700 (PDT) In-Reply-To: <86sewpahi8.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 04 Jul 2024 07:49:35 +0300") Received-SPF: pass client-ip=2a00:1450:4864:20::630; envelope-from=gerd.moellmann@gmail.com; helo=mail-ej1-x630.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.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:321302 Archived-At: Eli Zaretskii writes: >> From: Gerd M=C3=B6llmann >> Cc: emacs-devel@gnu.org >> Date: Wed, 03 Jul 2024 21:29:49 +0200 >>=20 >> 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). Let try me formulate in my own words what I understood, to see it is right. 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? >> 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? Well, Andrea talked about the importance of history. And >50% of the history are not on savannah. I guess I just don't understand what he means with history which should be preserved or how h expressed it.