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: ChangeLog and commit messages Date: Mon, 19 Jun 2023 19:33:54 +0300 Message-ID: <834jn38l8t.fsf@gnu.org> References: <87a5wxb5sl.fsf.ref@yahoo.com> <87a5wxb5sl.fsf@yahoo.com> <837cs1p6bf.fsf@gnu.org> <875y7lb4k7.fsf@yahoo.com> <327d575ab075bf4e92ca00c11548a62458fec75b.camel@yandex.ru> <87r0q86zvd.fsf@yahoo.com> <87jzw06j1y.fsf@yahoo.com> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="8004"; mail-complaints-to="usenet@ciao.gmane.io" Cc: hi-angel@yandex.ru, emacs-devel@gnu.org To: Po Lu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Jun 19 18:34:37 2023 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 1qBHps-0001tU-Qj for ged-emacs-devel@m.gmane-mx.org; Mon, 19 Jun 2023 18:34:36 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qBHpB-00029i-R5; Mon, 19 Jun 2023 12:33:53 -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 1qBHp9-00029T-KM for emacs-devel@gnu.org; Mon, 19 Jun 2023 12:33:51 -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 1qBHp8-0007Mb-Pu; Mon, 19 Jun 2023 12:33:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=Akt3pRnVQqfT/yqx5QfD80XvBJyBkZbnlwlxwY4zQoI=; b=l/htThYZ4GJt d/1mOf2m++A6M5UWwKlqKVZ9MgzXJJ3UgFFF99PDu8iO9b1Fao2W6zQvxt4L7M7GYRKFLbUpM4+Y2 TGE+PNZn4eokDx34Lo9Omumxz6Ym+c0W0T0Ais2PyZu2tZ1oNBZ3aNzwj1HiRCxtCaE1EvMNnFU8Z Ms04wgOcJN4fc/AUyFGP3slU7S5psvdYCw9xwxQvaEL6HfJEHYOdWMnUvEfvR2pk7szxxVoIXXU/u pkHP0ljY7jUqyhVySDIL53tdAOyNS6bEYFLJLxnqv6lR/yjK7ju637oHEaPt+T1uHjI0u6gWOY6r2 8bsWfF79f/ENCuTQKe+SFg==; Original-Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qBHp8-0008AX-9j; Mon, 19 Jun 2023 12:33:50 -0400 In-Reply-To: <87jzw06j1y.fsf@yahoo.com> (message from Po Lu on Mon, 19 Jun 2023 14:51:53 +0800) 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:307051 Archived-At: > From: Po Lu > Cc: Eli Zaretskii , emacs-devel@gnu.org > Date: Mon, 19 Jun 2023 14:51:53 +0800 > > Konstantin Kharlamov writes: > > > Hmm, it seems it's an SVN workflow, because in git or Mercurial you can't lock > > file. I didn't have experience of working with SVN (fortunately, from what I can > > tell), but I think if I had to work with it I would use `git-svn`. > > Most VCS have an option to perform locked check-outs of a file. Git and > Mercurial are exceptions. > > > Anyway, I kind of wanted to see a commit you have troubles adding a title for. > > Judging by your first message here it's the same situation with commits to > > Emacs, so you can drop some commit hash for example. I kind of can speculate > > based on the general description of this SVN workflow, but it may be more > > productive to look at specific cases where such problem arises. > > If you search for ``Update Android port'' in the feature/android branch, > you will see what I mean. If your problems are with the feature branch, then I think you are making your life harder than it needs to be. Our conventions for formatting commit log messages don't apply to feature branches. On feature branches, the developers are free to format the log messages as they see fit; the only log message that matters is the one for the merge-commit which lands the feature branch on master (which you have to create by hand anyway). The upshot of all this is that while you are working on a feature branch: . you can use short single-line note-like log messages, which might be unclear to anyone but yourself . you should generally commit each time when you finish some meaningful changeset, so that it could be later reverted without complications -- this goes well with short log messages . it is futile to use "C-x 4 a"-style log messages, especially for changes in files or in functions the branch adds, because in the final commit log we only need to see "foo: New file" This leaves you with the need to come up with a commit log for when the branch is landed. That might sometimes be a large job, but it will be much smaller than the sum total of what you do now. Moreover, what you do now will not help you avoid this job, because we do require3 a meaningful summary log message for when the branch is merged.