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 16:52:09 +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 1282488746 3801 80.91.229.12 (22 Aug 2010 14:52:26 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 22 Aug 2010 14:52:26 +0000 (UTC) Cc: bojan@bnikolic.co.uk, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Aug 22 16:52:23 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 1OnBuH-0001n9-CM for ged-emacs-devel@m.gmane.org; Sun, 22 Aug 2010 16:52:21 +0200 Original-Received: from localhost ([127.0.0.1]:34500 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OnBuG-0000v7-7V for ged-emacs-devel@m.gmane.org; Sun, 22 Aug 2010 10:52:20 -0400 Original-Received: from [140.186.70.92] (port=51506 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OnBuB-0000tq-CJ for emacs-devel@gnu.org; Sun, 22 Aug 2010 10:52:16 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OnBuA-00043B-9K for emacs-devel@gnu.org; Sun, 22 Aug 2010 10:52:15 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.9]:59176) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OnBu8-00042B-Gw; Sun, 22 Aug 2010 10:52:12 -0400 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id E108B1C1599B; Sun, 22 Aug 2010 16:52:09 +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 C8F441C007E8; Sun, 22 Aug 2010 16:52:09 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 501) id 99352CA299; Sun, 22 Aug 2010 16:52:09 +0200 (CEST) X-Yow: While I'm in LEVITTOWN I thought I'd like to see the NUCLEAR FAMILY!! In-Reply-To: (Eli Zaretskii's message of "Sun, 22 Aug 2010 09:14:23 -0400") 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:129041 Archived-At: Eli Zaretskii writes: >> From: Andreas Schwab >> Date: Sun, 22 Aug 2010 14:29:00 +0200 >> Cc: Bojan Nikolic , emacs-devel@gnu.org >> >> 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). > > You mean, use it with bzr via the extmerge plug-in? I've only used it with git so far. 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."