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: "Final" version of tty child frames Date: Wed, 18 Dec 2024 17:39:07 +0100 Message-ID: References: <86wmi0g0x6.fsf@gnu.org> <11a86987cce9fe0a257c3fa58703dc33@finder.org> <86wmgl6jzv.fsf@gnu.org> <092cb755eee3a9b5e06d15c0b07e90b1@finder.org> <276414b03c24964aaeb9e43e8dba5e77@finder.org> <5fedec86bce470555814acbdf999f99d@finder.org> <86h6791khk.fsf@gnu.org> <09b0904da92efad899865b2ece5f3116@finder.org> <86ikrhm6zk.fsf@gnu.org> <868qsdlzt5.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="23304"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: jared@finder.org, stefankangas@gmail.com, acorallo@gnu.org, emacs-devel@gnu.org, rudalics@gmx.at To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Dec 18 17:40:16 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 1tNx5r-0005ql-Aw for ged-emacs-devel@m.gmane-mx.org; Wed, 18 Dec 2024 17:40:15 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tNx4y-0006yF-43; Wed, 18 Dec 2024 11:39:20 -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 1tNx4w-0006vX-D1 for emacs-devel@gnu.org; Wed, 18 Dec 2024 11:39:18 -0500 Original-Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tNx4q-0003LR-H8; Wed, 18 Dec 2024 11:39:17 -0500 Original-Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-5cec9609303so9323163a12.1; Wed, 18 Dec 2024 08:39:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734539950; x=1735144750; 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=DZCK8DKjwRIleE7yEzL8F5YOf09lZwmXgqWm2YSN3sc=; b=eFtQ8QL5U5/iZb9lKLeoog8JUp/DP0nHlFkxgRSx/4eEQGWps+zTSthc24cwZ0PHDo GdqH/Yo3GWhrveVsJEPpiOtGILniFVnfpvAxIgY1O4ax/9N0z79Bw2EDowMnokElKUcV H4F+ABU8xFmmHT+XNcLURk0bZQz7q1hSvl27W4HxyNHu8z8FEHJnlnBrlXRNkbUMJV7e Yvptb8uZLp514gCLvwdcAxD8I/RSzenrm9YLS6+4fvuJMBk8wFdKS9VCjLrswFNz/4QR 3cGwqQG/r/cY6alsmI1tQ6HABIsv68MNQMa7YPsXN4i6qV1xEPOYaEDvxg/vEItBI9eb CSMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734539950; x=1735144750; 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=DZCK8DKjwRIleE7yEzL8F5YOf09lZwmXgqWm2YSN3sc=; b=JWT8gVTd9v6QsVwORVStECUjDYBNL6uehtyhCH/eHoxZt/pjMBu4PGXF8tSasYEQmz 4L7NI6UxCMD2sylO1WIJNKO/HeFK2ehH0BOe4QM0PMjh9ccWVx3/E7ZMKIa+TP21k0zq /iLpMK0UEJ1eO6oJHMI91uBl91SQkU9bxnm3H/Q01LdYo0yzHP95Hd1uHYCUuODSuq/4 eqxEHnwoFYrPdiWqfV4WXA9bv1OalYmqc+Zi9e0IOgxTBJLiWxr/pWZiQlJBCqO5P5wW iwAl5mTo6TtpuX1BlX7SSexNesJ2pOmbRBvNPg/yS6w+JJ2aQFH7Hvo0fINTvkSUm2uJ cVtg== X-Forwarded-Encrypted: i=1; AJvYcCUvg8ih3+4T2S3/oKkBupjzE0PKGmqvE2JiWkGcdiOGBAnEKmld7sczqGzMzc8GBZ7R5ujTS1nHvdjfOY0=@gnu.org, AJvYcCXO8qVYhBX37n0/+c72wm3C6ihZCKhgDwlDvOHT24kRIknoZpi17B9gqHadIdodzKu7kx25kTFQuQ==@gnu.org X-Gm-Message-State: AOJu0YyhAsHIJ8tFdsx5LZEXThkhbYLtlY3T+S4tjEhmC3p30Tn2WKIb X6PTaorpeXXU2aOLzHRGaqTuGnEysewLSSphrvqE9nFVQMGvG70N X-Gm-Gg: ASbGncvWzI9rpoCRe/sDHN69dRYJ6d18ZPt9/tRIojx8v6gRVY2xi6uGlGZfnnhGtPK B2AKknI42UPjyp6RhCLsFWkOL7fc8NEkNKRKR5O4YkxfqXK7gA5w9SFRnaHTUWUpIa2k/gr5Gyl 37ohfZCqhGV6REVZmQJxw732novXohbLXHT7tjHgG9FDq/9EtaDfuesFJJ6oeMygRlvTVb9pbD6 1nqVHXexyzTKPc10C1gRkzxjZxBpPapwY6CVwfrBSmfv5RKVtXfyUKVEmBiGGMr7y6VOB1Qi0LK fPxmpV8AdwON53GuRlQkGefYz/FKYMaBDjGRnW1W1BLVuZxWHNJfdp76RxHyJyVCUA== X-Google-Smtp-Source: AGHT+IHhjkm0m5mIAZCmP1v3RMdtZ3VFPGTlLqYR324oyype/95+RJgGUoPggau++RTjQUZwP4TVow== X-Received: by 2002:a05:6402:50cd:b0:5d2:7346:3ecb with SMTP id 4fb4d7f45d1cf-5d7ee3baaf1mr3295800a12.12.1734539949376; Wed, 18 Dec 2024 08:39:09 -0800 (PST) Original-Received: from pro2 (p200300e0b7267000f86be09dcd4cd505.dip0.t-ipconnect.de. [2003:e0:b726:7000:f86b:e09d:cd4c:d505]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5d652ae1210sm5520045a12.47.2024.12.18.08.39.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 08:39:08 -0800 (PST) In-Reply-To: <868qsdlzt5.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 18 Dec 2024 18:29:42 +0200") Received-SPF: pass client-ip=2a00:1450:4864:20::535; envelope-from=gerd.moellmann@gmail.com; helo=mail-ed1-x535.google.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.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, FREEMAIL_REPLY=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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:326666 Archived-At: Eli Zaretskii writes: >> From: Gerd M=C3=B6llmann >> Cc: Jared Finder , Stefan Kangas >> , Andrea Corallo , >> emacs-devel@gnu.org, rudalics@gmx.at >> Date: Wed, 18 Dec 2024 17:01:35 +0100 >>=20 >> Eli Zaretskii writes: >>=20 >> > If we don't see immediate ways of fixing some of these issues, I think >> > it should be okay to land this on master, if Stefan and Andrea agree. >>=20 >> In preparation, can I ask a few questions wrt landing? >>=20 >> What I seem to remember is that it entails a normal merge from >> scratch/tty-child-frames to master. No squashing, no interactive >> rebasing to fix commit messages first, or anything else complicated. > > Yes, that's the preference. > >> The merge commit message should have a certain form, IIRC. It should >> probably contain some introductory text like "This adds tty child >> frames...", and then ChangeLog-style entries. >>=20 >> For a new file it's basically sufficient to say "New file". >>=20 >> The rest gets a bit complicated, and I'm unsure how much detail is >> required. Say I've changed function parameters of an existing function >> plus I'm calling other functions whose API has changed plus added new >> code. Does that all have to appear in ChangeLog-style? That could take >> some time to produce. > > Preferably yes. However, for changing the function's signature you > can say something like > > * foo.c (bar): Accept additional argument FOOBAR. All callers > changed. > > (This is not different from the rules for any commit, not only > merge-commit.) Ok, thanks. > >> Another question: I can produce a list of commit IDs for changes that >> happened on the branch. Do we perhaps have some tool that produces these >> change log entries automatically? Something akin to >> magit-add-change-log-entry maybe? > > How would a tool know what to say in the description of the change? > Changes on feature branches usually don't have informative log > messages, they are usually minimal ("Fix crash in foobar" or > somesuch). That's right, magit-add-change-log-entry also only generates the skeleton. Didn't think of that :-). > What I usually do is produce diffs for the merge, then use "C-x 4 a" > to generate the file/function names, and add a description. The diff I have, so I guess I'll give it a try, when the others agree. Will take a bit, probably. Should I post the result when I have it?