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: Mon, 23 Aug 2010 01:30:03 -0400 Message-ID: References: <87occvzosg.fsf@bnikolic.co.uk> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1282541429 24267 80.91.229.12 (23 Aug 2010 05:30:29 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 23 Aug 2010 05:30:29 +0000 (UTC) To: rms@gnu.org, emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Aug 23 07:30:28 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 1OnPc2-0007LN-8c for ged-emacs-devel@m.gmane.org; Mon, 23 Aug 2010 07:30:26 +0200 Original-Received: from localhost ([127.0.0.1]:47567 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OnPc1-0006Fl-IN for ged-emacs-devel@m.gmane.org; Mon, 23 Aug 2010 01:30:25 -0400 Original-Received: from [199.232.76.173] (port=44535 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OnPbo-0006Ez-6N for emacs-devel@gnu.org; Mon, 23 Aug 2010 01:30:12 -0400 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1OnPbn-0001c4-2T for emacs-devel@gnu.org; Mon, 23 Aug 2010 01:30:12 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]:37674) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1OnPbm-0001bz-TH for emacs-devel@gnu.org; Mon, 23 Aug 2010 01:30:10 -0400 Original-Received: from eliz by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1OnPbf-0004nI-A0; Mon, 23 Aug 2010 01:30:03 -0400 In-reply-to: (message from Eli Zaretskii on Mon, 23 Aug 2010 01:11:04 -0400) 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:129062 Archived-At: > From: Eli Zaretskii > Date: Mon, 23 Aug 2010 01:11:04 -0400 > Cc: emacs-devel@gnu.org > Reply-To: Eli Zaretskii > > > From: Richard Stallman > > Date: Mon, 23 Aug 2010 00:24:56 -0400 > > Cc: bojan@bnikolic.co.uk, monnier@iro.umontreal.ca, emacs-devel@gnu.org > > Reply-To: rms@gnu.org > > > > There is a new GNU package called vc-changelog. > > Does it address the issues for Emacs concerning ChangeLog files > > and bzr? > > Where do I find this package? It's not in the GNU Software > Directory. The only one that comes close is vc-dwim -- did you mean > this one? I guess you meant vc-chlog that is part of vc-dwim. FWIW, I don't think it addresses the problems raised in this thread regarding the ChangeLog files. Those problems are due to bzr (and most if not all other VCSs) not being smart enough when merging ChangeLog files. This results in conflicts when merging changes, whose resolution is a mechanical job of removing the conflict markers and moving the log entries to the top of the file. It shouldn't be hard to write an Emacs command to resolve these conflicts. But it would be best if bzr itself could merge ChangeLog files without producing the conflicts in the first place. vc-chlog does not try to deal with that. Its main goal seems to be to make it easier to prepare ChangeLog entries before you are going to commit a changeset.