From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: bzr send workflow Date: Sun, 22 Aug 2010 14:29:00 +0200 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 1282480161 10507 80.91.229.12 (22 Aug 2010 12:29:21 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 22 Aug 2010 12:29:21 +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 Sun Aug 22 14:29:18 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 1On9fp-0002sX-0p for ged-emacs-devel@m.gmane.org; Sun, 22 Aug 2010 14:29:18 +0200 Original-Received: from localhost ([127.0.0.1]:50361 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1On9fj-0006SR-NI for ged-emacs-devel@m.gmane.org; Sun, 22 Aug 2010 08:29:11 -0400 Original-Received: from [140.186.70.92] (port=34835 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1On9fe-0006S3-1r for emacs-devel@gnu.org; Sun, 22 Aug 2010 08:29:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1On9fc-0002dI-JR for emacs-devel@gnu.org; Sun, 22 Aug 2010 08:29:05 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.10]:36780) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1On9fc-0002d3-DY for emacs-devel@gnu.org; Sun, 22 Aug 2010 08:29:04 -0400 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 98EC51C001BE; Sun, 22 Aug 2010 14:29:01 +0200 (CEST) Original-Received: from igel.home (ppp-93-104-145-149.dynamic.mnet-online.de [93.104.145.149]) by mail.mnet-online.de (Postfix) with ESMTP id 7B0281C001CE; Sun, 22 Aug 2010 14:29:01 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 501) id 1B6CECA299; Sun, 22 Aug 2010 14:29:01 +0200 (CEST) X-Yow: Nice decor! 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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:129030 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). Pretty much a non-issue with git-merge-changelog (from gnulib). Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."