Rebase pain on (the) pot

Do we have a merge driver or something for the l10n files?

I'm trying to rebase an older branch on top of origin/next. My topic branch has changes to git.pot (the old glossary command idea), and rebasing produces a lot of conflicts due to simple line number changes in the comments. (The de.po in the next commit to be rebased won't fair any better, probably.)

Michael

Michael J Gruber <drmicha@warpmail.net> writes:

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".