From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: bzr send workflow Date: Sun, 22 Aug 2010 09:14:23 -0400 Message-ID: References: <87occvzosg.fsf@bnikolic.co.uk> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1282482873 18660 80.91.229.12 (22 Aug 2010 13:14:33 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 22 Aug 2010 13:14:33 +0000 (UTC) Cc: bojan@bnikolic.co.uk, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Aug 22 15:14:31 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 1OnANb-0003jy-JW for ged-emacs-devel@m.gmane.org; Sun, 22 Aug 2010 15:14:31 +0200 Original-Received: from localhost ([127.0.0.1]:56318 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OnANb-0006nz-02 for ged-emacs-devel@m.gmane.org; Sun, 22 Aug 2010 09:14:31 -0400 Original-Received: from [199.232.76.173] (port=52531 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OnANX-0006nK-4y for emacs-devel@gnu.org; Sun, 22 Aug 2010 09:14:27 -0400 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1OnANW-0006NA-3a for emacs-devel@gnu.org; Sun, 22 Aug 2010 09:14:26 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]:59451) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1OnANV-0006N5-TU for emacs-devel@gnu.org; Sun, 22 Aug 2010 09:14:26 -0400 Original-Received: from eliz by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1OnANT-0005xR-T7; Sun, 22 Aug 2010 09:14:23 -0400 In-reply-to: (message from Andreas Schwab on Sun, 22 Aug 2010 14:29:00 +0200) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) 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:129033 Archived-At: > 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? And btw, it sounds a simple job to write an Emacs command that would resolve such conflicts in a ChangeLog file and commit the result.