From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juanma Barranquero Newsgroups: gmane.emacs.devel Subject: Re: Workflow to accumulate individual changes? Date: Thu, 31 Dec 2009 14:53:31 +0100 Message-ID: References: <87637of4y8.fsf@kobe.laptop> <87oclfdzs2.fsf@kobe.laptop> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1262267669 23121 80.91.229.12 (31 Dec 2009 13:54:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 31 Dec 2009 13:54:29 +0000 (UTC) Cc: Eli Zaretskii , Andreas Schwab , emacs-devel@gnu.org To: Giorgos Keramidas Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 31 14:54:22 2009 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.50) id 1NQLTp-000570-Q1 for ged-emacs-devel@m.gmane.org; Thu, 31 Dec 2009 14:54:22 +0100 Original-Received: from localhost ([127.0.0.1]:50396 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQLTq-00020n-AX for ged-emacs-devel@m.gmane.org; Thu, 31 Dec 2009 08:54:22 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NQLTS-0001gA-NU for emacs-devel@gnu.org; Thu, 31 Dec 2009 08:53:58 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NQLTO-0001cM-5i for emacs-devel@gnu.org; Thu, 31 Dec 2009 08:53:58 -0500 Original-Received: from [199.232.76.173] (port=34640 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQLTN-0001c0-RN for emacs-devel@gnu.org; Thu, 31 Dec 2009 08:53:53 -0500 Original-Received: from mail-bw0-f215.google.com ([209.85.218.215]:52189) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NQLTM-0003Zt-3N; Thu, 31 Dec 2009 08:53:52 -0500 Original-Received: by mail-bw0-f215.google.com with SMTP id 7so8859003bwz.26 for ; Thu, 31 Dec 2009 05:53:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :from:date:message-id:subject:to:cc:content-type :content-transfer-encoding; bh=dcdX2nPMsweUlS3blvh8aYJr7RmX+dkag+c1io/l0Wo=; b=uxdR8+60VgsRmKW21WkB4+CYr8MbEFUnPjfjaYjVNbMVDJ4ib59WgmVyY8UNbmHe5D 6Bdb8/iRlNbaWTpEtb9xA9hhTIYgWC1jc8IXVe/YnFSX5qYYKGER+I+b4GdVYYLAvnZP YBdbUIRoQY7kx3l8O8TZwQSQQg+YIC6n8HpD4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=djCuZDX61SIiF4rtlXxU4XRb21rnC314WhwsVzSNlkouCFtWdFI52qQmmuvee+0wdS /Fj+fD+D1GDQVfTPTkysRZIw+oYbzMmqknqO8xOJtyZRJPzEG4bYIUjoqQ/MV4D1NHaU 5fP3UyVIvaL/j26DSJQKoegUr967Q4s4pip7A= Original-Received: by 10.204.156.19 with SMTP id u19mr6336200bkw.62.1262267631125; Thu, 31 Dec 2009 05:53:51 -0800 (PST) In-Reply-To: <87oclfdzs2.fsf@kobe.laptop> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) 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:119151 Archived-At: On Thu, Dec 31, 2009 at 14:43, Giorgos Keramidas wrote: > I think it's very useful to see file changes in the ChangeLog. =C2=A0It h= elps > a lot when an Emacs user downloads a tarball of the sources from the FTP > site, because file changes are visible without full access to the > original branch itself or access to a bzr client. If we were using the commit log to put ChangeLog entries, the ChangeLog could be reconstructed as part of making the release tarball by a simple bzr log --gnu-changelog -r ... > Maybe we can try to strike a balance between not keeping the ChangeLog > up to date at all and making it difficult to commit *one* changeset that > includes both ChangeLog updates _and_ file updates by committing the > ChangeLog updates separately? That breaks the idea that commits should try to respect the ACID (atomicity, consistency, isolation, durability) principle. > To avoid doubling the revisions we keep in the repository, by following > *every* single commit with a ChangeLog update, we can batch ChangeLog > updates. =C2=A0So a developer can work in his own local branch and commit > several local changes before updating the ChangeLog. =C2=A0Then a single > ChangeLog commit on top of those can be stacked on top of the batch of > local changes, right before they are pushed to the trunk. Personally, I find this idea ugly. Juanma