From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: No ChangeLog's (was: bzr send workflow) Date: Sun, 22 Aug 2010 01:26:52 -0400 Message-ID: References: <87occvzosg.fsf@bnikolic.co.uk> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1282454829 10580 80.91.229.12 (22 Aug 2010 05:27:09 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 22 Aug 2010 05:27:09 +0000 (UTC) Cc: bojan@bnikolic.co.uk, emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Aug 22 07:27:07 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1On35F-00043y-KO for ged-emacs-devel@m.gmane.org; Sun, 22 Aug 2010 07:27:05 +0200 Original-Received: from localhost ([127.0.0.1]:43395 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1On35E-0007FF-Q4 for ged-emacs-devel@m.gmane.org; Sun, 22 Aug 2010 01:27:04 -0400 Original-Received: from [199.232.76.173] (port=55657 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1On354-0007FA-CT for emacs-devel@gnu.org; Sun, 22 Aug 2010 01:26:54 -0400 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1On353-0003yq-At for emacs-devel@gnu.org; Sun, 22 Aug 2010 01:26:54 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]:47435) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1On353-0003ym-4Y for emacs-devel@gnu.org; Sun, 22 Aug 2010 01:26:53 -0400 Original-Received: from eliz by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1On352-0004f2-AD; Sun, 22 Aug 2010 01:26:52 -0400 In-reply-to: (message from Stefan Monnier on Sun, 22 Aug 2010 00:05:33 +0200) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:129005 Archived-At: > From: Stefan Monnier > Date: Sun, 22 Aug 2010 00:05:33 +0200 > Cc: emacs-devel@gnu.org > > > Since maybe I missed the discussion on this, I just wanted to ask if > > this workflow has been considered and rejected? If not, I'd be happy to > > offer a more detailed summary of how it works and the advantages. > > Before we can switch to such a system, we need to get rid of the > ChangeLog files (which are otherwise a constant source of spurious > conflicts which make such a workflow impractical). I haven't dared to > enter this discussion yet. Do we have the necessary infrastructure for ditching ChangeLog files? Working on a complex feature could take quite some time, perhaps more than a single Emacs session. With ChangeLog's, one can keep the log of changes in a disk file, which is persistent, and then reuse that log at commit time. What do we do instead when there are no ChangeLog files? Are there any commands that let us edit log messages for future commits, keep their record, and use them conveniently when the time comes to commit?