From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juanma Barranquero Newsgroups: gmane.emacs.devel Subject: Re: bzr help, please Date: Fri, 1 Jul 2011 13:48:00 +0200 Message-ID: References: <4E0D0407.7000205@cs.ucla.edu> <83boxescnx.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1309522300 22837 80.91.229.12 (1 Jul 2011 12:11:40 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 1 Jul 2011 12:11:40 +0000 (UTC) Cc: Lars Magne Ingebrigtsen , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jul 01 14:11:36 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QccZL-0008GW-Bx for ged-emacs-devel@m.gmane.org; Fri, 01 Jul 2011 14:11:35 +0200 Original-Received: from localhost ([::1]:46308 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QccZK-0008IK-Bh for ged-emacs-devel@m.gmane.org; Fri, 01 Jul 2011 08:11:34 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:38840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QccDG-0002QG-3V for emacs-devel@gnu.org; Fri, 01 Jul 2011 07:48:48 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QccDE-0000bi-EQ for emacs-devel@gnu.org; Fri, 01 Jul 2011 07:48:45 -0400 Original-Received: from mail-qy0-f169.google.com ([209.85.216.169]:65236) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QccDB-0000bB-PE; Fri, 01 Jul 2011 07:48:41 -0400 Original-Received: by qyk32 with SMTP id 32so711279qyk.0 for ; Fri, 01 Jul 2011 04:48:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; bh=gPGxwgESTSFCg5UiBPGBigDS5Ooj9tpUo+IwcLhfzz8=; b=Olni2tpWgiNjh0JizurdVvgef+RNJVAv/IQ3melqGORCP8z3YBjRFUT2/ktX7qzyX5 qSwAet8TspcTJerUMc4LliRI8ZeMtmfPM843Adl6/+ZV+sctY36iWsqx6RC4WoK2bWxf Acn07jyObghrOnX7/sBy8CUYWv5da0D/3liKY= Original-Received: by 10.229.66.200 with SMTP id o8mr213478qci.250.1309520920155; Fri, 01 Jul 2011 04:48:40 -0700 (PDT) Original-Received: by 10.229.40.131 with HTTP; Fri, 1 Jul 2011 04:48:00 -0700 (PDT) In-Reply-To: <83boxescnx.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.216.169 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:141356 Archived-At: On Fri, Jul 1, 2011 at 09:06, Eli Zaretskii wrote: > Install the changelog_merge plugin > (https://launchpad.net/bzr-changelog-merge), and you will never ever > have merge conflicts in ChangeLog files. =C2=A0This will be included in t= he > next version 2.4 of bzr, but for now you will need to install it > separately. 2.4b4 does not include changelog_merge. There's a news_merge, but it seems specific for bazaar's NEWS file. Or do you mean that the funcionality will be included without requiring a plugin? =C2=A0 =C2=A0 Juanma