From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bojan Nikolic Newsgroups: gmane.emacs.devel Subject: Re: bzr send workflow Date: Sat, 21 Aug 2010 23:48:41 +0100 Message-ID: <871v9rzinq.fsf@bnikolic.co.uk> 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 1282445778 25003 80.91.229.12 (22 Aug 2010 02:56:18 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 22 Aug 2010 02:56:18 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Aug 22 04:56:17 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 1On0jJ-0001QU-Ae for ged-emacs-devel@m.gmane.org; Sun, 22 Aug 2010 04:56:17 +0200 Original-Received: from localhost ([127.0.0.1]:52528 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1On0jI-0004KI-RV for ged-emacs-devel@m.gmane.org; Sat, 21 Aug 2010 22:56:16 -0400 Original-Received: from [140.186.70.92] (port=36613 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Omwxd-0003TA-EL for emacs-devel@gnu.org; Sat, 21 Aug 2010 18:54:50 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Omwrr-0002Pf-Tw for emacs-devel@gnu.org; Sat, 21 Aug 2010 18:48:53 -0400 Original-Received: from out1.smtp.messagingengine.com ([66.111.4.25]:50292) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Omwrr-0002PV-P2 for emacs-devel@gnu.org; Sat, 21 Aug 2010 18:48:51 -0400 Original-Received: from compute2.internal (compute2.internal [10.202.2.42]) by gateway1.messagingengine.com (Postfix) with ESMTP id 7DDA3E6; Sat, 21 Aug 2010 18:48:50 -0400 (EDT) Original-Received: from frontend2.messagingengine.com ([10.202.2.161]) by compute2.internal (MEProxy); Sat, 21 Aug 2010 18:48:50 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=messagingengine.com; h=from:to:cc:subject:in-reply-to:references:date:message-id:mime-version:content-type; s=smtpout; bh=KgWko8ZePpeF1KV5b+tPZrCjsjY=; b=uTrIImcGm/IZXRIjR3f3cpjmMpSFZHKFO+ogWeSNKPNWpw9CJUXPk/zzO+9bkqWEepfCa0bHmEVJ5DDbnnPKyqz+MFRFj+NKyZI3hQPgY5nHBxoLegdu1n9scchRhGoREEjpPva1xP14hE6GVZUrPl31lD2vJpw8L/ylsajyFv8= X-Sasl-enc: 8x0g7Vreq6tlR97yXn3SQXmubQzvKhyEW0Qeb51r23kM 1282430930 Original-Received: from bnikolic-laptop (nat-01.alma.cl [200.2.0.129]) by mail.messagingengine.com (Postfix) with ESMTPSA id B7C2A5E8F9E; Sat, 21 Aug 2010 18:48:49 -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.1 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Mailman-Approved-At: Sat, 21 Aug 2010 22:56:12 -0400 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:129004 Archived-At: 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. I see. I'm sure this will not satisfy everybody, but the --gnu-changelog option to bzr log attempts to produce something fairly close to the ChangeLog files, at least in format. For example: bzr log -n 1 -r -10.. --gnu-changelog lisp/ gives a reasonable summary of last 10 changes in lisp directory. Best, Bojan -- Bojan Nikolic || http://www.bnikolic.co.uk