{"thread":{"id":"38856","subject":"Rebase pain on (the) pot","startedAt":"2015-03-19T14:31:47Z","lastAt":"2015-03-19T19:43:56Z","messageCount":2,"participants":["Michael J Gruber","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"258027","messageId":"550ADDD3.9070706@warpmail.net","threadId":"38856","inReplyTo":null,"subject":"Rebase pain on (the) pot","fromName":"Michael J Gruber","fromEmail":"drmicha@warpmail.net","sentAt":"2015-03-19T14:31:47Z","receivedAt":"2015-03-19T14:31:47Z","isPatch":false,"sender":{"key":"drmicha@warpmail.net","avatar":null},"body":"Do we have a merge driver or something for the l10n files?\n\nI'm trying to rebase an older branch on top of origin/next. My topic\nbranch has changes to git.pot (the old glossary command idea), and\nrebasing produces a lot of conflicts due to simple line number changes\nin the comments. (The de.po in the next commit to be rebased won't fair\nany better, probably.)\n\nMichael\n"},{"id":"258043","messageId":"xmqqlhisixhf.fsf@gitster.dls.corp.google.com","threadId":"38856","inReplyTo":"550ADDD3.9070706@warpmail.net","subject":"Re: Rebase pain on (the) pot","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-03-19T19:43:56Z","receivedAt":"2015-03-19T19:43:56Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michael J Gruber <drmicha@warpmail.net> writes:\n\n> Do we have a merge driver or something for the l10n files?\n\nI haven't heard of any, but given that these can be added back by\nrunning xgettext and the result will have the up-to-date line\nnumbers, it wouldn't be wrong to define a script that roughly does:\n\n    * find a run of lines that match \"^#: .*$\" and replace it with a\n      single line with \"#:\" in original, ours and theirs.\n\n    * feed these three files to 'merge' from RCS suite.\n\nand use that as a merge driver.  The merged result would lose the\nline number information, so if you really care, you could run \"make\npot\" at each step to update it but I do not think it matters as long\nas you do so at the very end once, even as a follow-up \"fix-up\"\npatch that says \"we deliberately lost the line number information\nduring the series to avoid unnecessary merge conflicts, and this\ncommit puts it back\".\n"}]}