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 01:11:19 +0100 Message-ID: References: <87637of4y8.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 1262218334 18362 80.91.229.12 (31 Dec 2009 00:12:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 31 Dec 2009 00:12:14 +0000 (UTC) Cc: Emacs developers To: Giorgos Keramidas Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 31 01:12:06 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 1NQ8e6-0005QP-DV for ged-emacs-devel@m.gmane.org; Thu, 31 Dec 2009 01:12:06 +0100 Original-Received: from localhost ([127.0.0.1]:55485 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQ8e6-0002D4-OW for ged-emacs-devel@m.gmane.org; Wed, 30 Dec 2009 19:12:06 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NQ8dl-00021o-Jr for emacs-devel@gnu.org; Wed, 30 Dec 2009 19:11:45 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NQ8dg-0001zX-QH for emacs-devel@gnu.org; Wed, 30 Dec 2009 19:11:45 -0500 Original-Received: from [199.232.76.173] (port=59258 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQ8dg-0001zS-Ld for emacs-devel@gnu.org; Wed, 30 Dec 2009 19:11:40 -0500 Original-Received: from mail-bw0-f215.google.com ([209.85.218.215]:51469) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NQ8dg-0005B4-9L for emacs-devel@gnu.org; Wed, 30 Dec 2009 19:11:40 -0500 Original-Received: by bwz7 with SMTP id 7so8615782bwz.26 for ; Wed, 30 Dec 2009 16:11:39 -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=tfBMzBwXJ+Bh2otHHD/REQJlzOd+DDYpXQVlhwGBGik=; b=SHzv5I5AH0NBVp2oh7IOWeCGa2Eimy6YNfGNYHlFbFFYCyHHfj4voaoOVHeQ57Jse1 EuqXvwI9nHi/hvjYE8AErP4EY/lxKm86PBC6I/4oDO/EDM9T2++baWaEz15J5/9RsGYZ 0M9uDLEnda6vGP6vTuNXFIIZl268Ugk6FqBKg= 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=tKPI/zdgJEjHN1EWyDMrAi/OIKcMzrwc5roXXxikN2sTOCs0x/o7I/yOYrXUZPIFhg ta3Q5RwhO4xUZSButtbexSjraClEoiRxGfxC6HBvhTVR21QLrIC3DnQcAGD9VbtNPazY Lr3z7YD+OVS1Jfgtj5GVb4u4K8SQ+hMtxSEik= Original-Received: by 10.204.3.152 with SMTP id 24mr918074bkn.168.1262218299105; Wed, 30 Dec 2009 16:11:39 -0800 (PST) In-Reply-To: <87637of4y8.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:119083 Archived-At: On Wed, Dec 30, 2009 at 23:54, Giorgos Keramidas wrote: > If the changes are separate commits, it *may* be simple to avoid a > gazillion merges (one for each small change) by using the rebase plugin > of bazaar. =C2=A0This way instead of having a history like Yes, thanks to both =C3=93scar and you for the idea. Unfortunately, as I've said, I think it does not mess too well with ChangeLog. BTW, I'm interested in ways to deal with ChangeLog issues like this. For example, if you spend a while developing a large side project on a branch, your ChangeLog in that branch will reflect the dates of individual changes. In the past, at the moment of merging the branch back into the trunk, the dates were changed (most of unicode-2, or multi-tty, were entered into the ChangeLog at the date the merge happened). With Bazaar, we'd like to keep that kind of operation as a single merge, so perhaps the last commit in the task branch will need to be a ChangeLog fix with the day the merging is planned... Works, but seems a bit messy. I know it has been decided we still will maintain ChangeLogs, and I'm not going to discuss it, but it's a bit of a pity, when a good commit message policy and bzr log --gnu-changelog could save us the trouble. Juanma