Changes between Version 126 and Version 127 of TracL10N

Timestamp:

Jan 28, 2013, 1:05:40 AM (11 years ago)

Author:

Christian Boos

Comment:

#ForCommitters: describe usage of l10n_revert_lineno_conflicts.py script (r11614)

TracL10N

@@ -442 +442 @@
 When you're adding a new catalog (`make init-...`), be sure to set "native" line-endings before committing (`svn pset svn:eol-style native trac/locale/.../LC_MESSAGES/....po`).
 
+Now that all the maintenance branches have l10n support, special care should be taken when merging l10n changes from one branch to the next.
+
+One problem to be expected with the merge is a high rate of conflicts due to line number differences. Even if the source text (the `msgid`) are often unchanged, it's very likely that their position in the file will be different.
+
+The [source:trunk/contrib/l10n_revert_lineno_conflicts.py] can be used to remove those spurious conflicts.
+
+Example workflow:
+{{{
+1.0-stable$ make update
+1.0-stable$ svn merge ^/branches/0.12-stable --accept postpone
+1.0-stable$ $ svn st -q | sed -e 's,\\,/,g' | grep ^C | cut -c2- > conflicted.files
+1.0-stable$ python contrib/l10n_revert_lineno_conflicts.py `cat conflicted.files`
+reverted 6 ignorable changes in trac/locale/fa/LC_MESSAGES/messages.po
+reverted 1 ignorable changes in trac/locale/nb/LC_MESSAGES/messages.po
+reverted 147 ignorable changes in trac/locale/nl/LC_MESSAGES/messages.po
+no ignorable changes in trac/locale/nl/LC_MESSAGES/messages-js.po
+[...]
+}}}
+At this point, one can inspect the remaining meaningful conflicts and resolved them manually.
+
+Then:
+{{{
+1.0-stable$ make update
+}}}
+to remove the spurious line number difference, review and commit.
+
+
 === For Developers