From: Eli Zaretskii <eliz@gnu.org>
To: Miles Bader <miles@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: changelog-merge plugin and edited ChangeLog entries
Date: Sat, 26 Feb 2011 10:52:34 +0200 [thread overview]
Message-ID: <83d3mfp48d.fsf@gnu.org> (raw)
In-Reply-To: <87aahji3qm.fsf@catnip.gol.com>
> From: Miles Bader <miles@gnu.org>
> Cc: Glenn Morris <rgm@gnu.org>, emacs-devel@gnu.org
> Date: Sat, 26 Feb 2011 17:45:05 +0900
>
> The gnulib "git-merge-changelog" merge program[*] is reported to
> handle this case correctly, and supposedly can be used with either git
> or bzr (or hg).
I know. But (a) it's a pain to build it on Windows, and (b) it can be
used with bzr only as an external merge tool, which means you cannot
just say "bzr merge ...", because you need a special switch to the
merge command, just for ChangeLog files.
next prev parent reply other threads:[~2011-02-26 8:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-26 8:04 changelog-merge plugin and edited ChangeLog entries Eli Zaretskii
2011-02-26 8:45 ` Miles Bader
2011-02-26 8:52 ` Eli Zaretskii [this message]
2011-02-26 19:53 ` Stefan Monnier
2011-02-26 22:52 ` Miles Bader
2011-02-27 3:57 ` Eli Zaretskii
2011-02-27 5:07 ` Miles Bader
2011-02-26 19:33 ` Glenn Morris
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83d3mfp48d.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=miles@gnu.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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).