po files are modified on build so as to break bzr pull

[Kyle Nitzsche]

Let's say you have a jumpstart book consisting of jumpstart modules. Each module has its po files (in content/po/. When the book is built, those po files are updated (the pot file for the module is first updated from source and then each target po file is too). Then you push your module branch. But someone else has the branch too and knowing they need to update, they do a 'bzr pull'.

Problem: the bzr pull fails because bzr cannot automerge the po files (conflicts). This happens even when you have not modified translations (they are spurious), so it effectively makes it difficult to use bzr to store module branches, which is essential.

[Kyle Nitzsche (knitzsche)]

A solution may be to use 'bzr pull --overwrite content/po' to simply use the upstream po files. then 'bzr pull' to get the rest.

Alternatively, the doctemplate itself could be modified to assume po files are stored in a separate location and are first copied to content/po/ on build. And branches can ignore conten/po/*. In this case updating the 'real' po files is a separate and intentional action. One would still need to do a bzr pull with --overwrite to simply get the new real po files. The advantage is that this requirement is less frequent (only when po files are actually changed with new translations) and files in bzr undergo no unnecessary churn (one does not need to commit spurious po file changes that happen on every build).

[Kyle Nitzsche (knitzsche)]

I implemented the second option described in comment #1

[Kyle Nitzsche (knitzsche)]

fix released with 2.3