From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andy Wingo Newsgroups: gmane.emacs.devel Subject: Re: bzr send workflow Date: Wed, 25 Aug 2010 11:03:17 -0400 Message-ID: References: <87occvzosg.fsf@bnikolic.co.uk> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1282748838 30038 80.91.229.12 (25 Aug 2010 15:07:18 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 25 Aug 2010 15:07:18 +0000 (UTC) Cc: Bojan Nikolic , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 25 17:07:16 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 1OoHZL-0005EU-Pm for ged-emacs-devel@m.gmane.org; Wed, 25 Aug 2010 17:07:16 +0200 Original-Received: from localhost ([127.0.0.1]:59723 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OoHZL-0003Iz-5P for ged-emacs-devel@m.gmane.org; Wed, 25 Aug 2010 11:07:15 -0400 Original-Received: from [140.186.70.92] (port=34037 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OoHSV-0006kd-Hj for emacs-devel@gnu.org; Wed, 25 Aug 2010 11:00:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OoHST-00078q-8B for emacs-devel@gnu.org; Wed, 25 Aug 2010 11:00:11 -0400 Original-Received: from a-pb-sasl-quonix.pobox.com ([208.72.237.25]:56583 helo=sasl.smtp.pobox.com) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OoHST-00078Z-65 for emacs-devel@gnu.org; Wed, 25 Aug 2010 11:00:09 -0400 Original-Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by a-pb-sasl-quonix.pobox.com (Postfix) with ESMTP id 62D87D01BC; Wed, 25 Aug 2010 11:00:08 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=wo8NZkDM9q5QnSSPylErrTNnnk8=; b=n3bYJU D+7atftLuOi55XWWuYvOqkC0wtxZS2a7tI2RqaOD5LpDEP3k5Lsrk6tWHjZ174yO QwoHehAd7R6wEn2VG+g9d5qFqxvmEIbnlifYO8QyMgWB0FmgMGcA5OkqUlYVouPM w+buD8TNDcT392DixU8dX32Ga3fkJfoRL78l0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=XaQ33QdR0cOsBVXjvLrVEpEGw1BHyplp RmS6YGr9TqIFQX1s7eXW2ZFd20uGJGNHjuirepN5rOfr4vC1BbAWVB09+MqInZ3d TIdeGzjC9V70xwaxPB1FKbmSv5aAPBrgpmp38cqDgwbBA/PgKrdrgRsAThUVefST KBqWqPu/bCw= Original-Received: from a-pb-sasl-quonix. (unknown [127.0.0.1]) by a-pb-sasl-quonix.pobox.com (Postfix) with ESMTP id EF8B6D01B2; Wed, 25 Aug 2010 11:00:05 -0400 (EDT) Original-Received: from unquote.localdomain (unknown [166.82.167.71]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by a-pb-sasl-quonix.pobox.com (Postfix) with ESMTPSA id 71BAAD0197; Wed, 25 Aug 2010 11:00:03 -0400 (EDT) In-Reply-To: (Stefan Monnier's message of "Sun, 22 Aug 2010 00:05:33 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-Pobox-Relay-ID: 723BCD80-B059-11DF-8D07-030CEE7EF46B-02397024!a-pb-sasl-quonix.pobox.com X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) 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:129211 Archived-At: Greets, On Sat 21 Aug 2010 18:05, Stefan Monnier writes: > 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. That I am aware of, you have two good options: * Keep writing changelogs, pasting them into the commit logs as you do already, and add special support to merging changelogs (e.g.: git-merge-changelog from gnulib, perhaps ported to bzr if you stay with bzr) * Stop writing changelogs, and generate changelogs via a dist-hook. Guile does this now, using gitlog-to-changelog from gnulib. Cheers, Andy -- http://wingolog.org/