From: Juanma Barranquero <lekktu@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Lars Magne Ingebrigtsen <larsi@gnus.org>, emacs-devel@gnu.org
Subject: Re: bzr help, please
Date: Fri, 1 Jul 2011 13:48:00 +0200 [thread overview]
Message-ID: <BANLkTimbjeXYdrpAYL_mky2LRD9WPU4DOQ@mail.gmail.com> (raw)
In-Reply-To: <83boxescnx.fsf@gnu.org>
On Fri, Jul 1, 2011 at 09:06, Eli Zaretskii <eliz@gnu.org> wrote:
> Install the changelog_merge plugin
> (https://launchpad.net/bzr-changelog-merge), and you will never ever
> have merge conflicts in ChangeLog files. This will be included in the
> 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?
Juanma
next prev parent reply other threads:[~2011-07-01 11:48 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-30 22:26 bzr help, please Lars Magne Ingebrigtsen
2011-06-30 23:17 ` Paul Eggert
2011-06-30 23:25 ` Lars Magne Ingebrigtsen
2011-07-01 7:06 ` Eli Zaretskii
2011-07-01 10:14 ` Lars Magne Ingebrigtsen
2011-07-01 11:05 ` Eli Zaretskii
2011-07-01 11:08 ` Lars Magne Ingebrigtsen
2011-07-01 14:26 ` Stefan Monnier
2011-07-01 14:51 ` Lars Magne Ingebrigtsen
2011-07-04 13:57 ` Lars Magne Ingebrigtsen
2011-07-04 17:26 ` Stefan Monnier
2011-07-05 15:20 ` Lars Magne Ingebrigtsen
2011-07-04 17:29 ` Stefan Monnier
2011-07-01 11:48 ` Juanma Barranquero [this message]
2011-07-01 14:07 ` Eli Zaretskii
2011-07-01 14:32 ` Juanma Barranquero
2011-06-30 23:18 ` Andreas Schwab
2011-07-01 3:03 ` Stefan Monnier
2011-07-01 6:58 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BANLkTimbjeXYdrpAYL_mky2LRD9WPU4DOQ@mail.gmail.com \
--to=lekktu@gmail.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=larsi@gnus.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.