From: Junio C Hamano <gitster@pobox•com>
To: Michael J Gruber <drmicha@warpmail•net>
Cc: Git Mailing List <git@vger•kernel.org>
Subject: Re: Rebase pain on (the) pot
Date: Thu, 19 Mar 2015 12:43:56 -0700 [thread overview]
Message-ID: <xmqqlhisixhf.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <550ADDD3.9070706@warpmail.net> (Michael J. Gruber's message of "Thu, 19 Mar 2015 15:31:47 +0100")
Michael J Gruber <drmicha@warpmail•net> writes:
> Do we have a merge driver or something for the l10n files?
I haven't heard of any, but given that these can be added back by
running xgettext and the result will have the up-to-date line
numbers, it wouldn't be wrong to define a script that roughly does:
* find a run of lines that match "^#: .*$" and replace it with a
single line with "#:" in original, ours and theirs.
* feed these three files to 'merge' from RCS suite.
and use that as a merge driver. The merged result would lose the
line number information, so if you really care, you could run "make
pot" at each step to update it but I do not think it matters as long
as you do so at the very end once, even as a follow-up "fix-up"
patch that says "we deliberately lost the line number information
during the series to avoid unnecessary merge conflicts, and this
commit puts it back".
prev parent reply other threads:[~2015-03-19 19:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-19 14:31 Rebase pain on (the) pot Michael J Gruber
2015-03-19 19:43 ` Junio C Hamano [this message]
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=xmqqlhisixhf.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=drmicha@warpmail$(echo .)net \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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