From: Tom Tromey <tom@tromey.com>
To: Joel Brobecker <brobecker@adacore.com>
Cc: Tom Tromey <tromey@adacore.com>, gdb-patches@sourceware.org
Subject: Re: [PATCH] Minor Ada task cleanups
Date: Tue, 19 Feb 2019 13:13:00 -0000 [thread overview]
Message-ID: <87bm37vs3i.fsf@tromey.com> (raw)
In-Reply-To: <20190217145708.GC8537@adacore.com> (Joel Brobecker's message of "Sun, 17 Feb 2019 18:57:08 +0400")
>>>>> "Joel" == Joel Brobecker <brobecker@adacore.com> writes:
Joel> One question independent of this patch first: I am wondering - how
Joel> do you deal with submissions that you want to "git am" but have
Joel> a ChangeLog patch in it that cause a merge failure?
This was a bug in my script to send email -- it failed to remove the
ChangeLog hunk when sending from a git worktree. I've just fixed it.
You can see my scripts here: https://github.com/tromey/git-gnu-changelog
For the case of applying a patch, I use git-merge-changelog, from
gnulib. Fedora packages it so you can just "dnf install" it. This
avoids most problems arising from applying patches with ChangeLogs (I
think I had one problem in the last few years).
Mark once wrote up some instructions that I still follow when setting
this up:
https://gnu.wildebeest.org/blog/mjw/2012/03/16/automagically-merging-changelog-files-with-mercurial-or-git/
Tom
next prev parent reply other threads:[~2019-02-19 13:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-15 21:23 Tom Tromey
2019-02-17 14:57 ` Joel Brobecker
2019-02-19 13:13 ` Tom Tromey [this message]
2019-02-19 19:25 ` Tom Tromey
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=87bm37vs3i.fsf@tromey.com \
--to=tom@tromey.com \
--cc=brobecker@adacore.com \
--cc=gdb-patches@sourceware.org \
--cc=tromey@adacore.com \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox