[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Translation maintenance requires direct branch commits. (Doesn't it?)

From: plasma <plasma_at_ms9.hinet.net>
Date: 2004-09-30 06:00:15 CEST

On Thu, Sep 09, 2004 at 10:00:25PM +0200, Erik Huelsmann wrote:
> Several translation maintainers have mentioned this and I have promised to
> write about it. In this mail I'm trying to find out if I understand the
> issue correctly. Please feel free to comment. (Or rather: please comment!
> :-)

I tried to follow 'Maintenance on branches' in TRANSLATING today, but
step 7 and 8 confused me. If we follow steps 7 and 8, then we'll have
three revisions committed if there are fuzzy messages between trunk
and branch. But I think there should be two revisions at most for
updating trunk and branch.

I found a way that two revisions are enough to update both trunk and
branch. But I'm not sure if it is direct commit that running 'make
locale-gnu-po-update' then commit.

Below are modified steps:

  5. Locate the fuzzy messages and messages that shows up as
     untranslated. Append these messages (msgid and msgstr only, line
     number not necessary) in the .po file on trunk. Prepend '=~ '
     before those lines.
  6. Copy the locally modified trunk version to the branch and run "make
     locale-gnu-po-update". Repeat step 5 and 6 until all fuzzy and
     untranslated messages on the trunk are gone.
  7. Commit the trunk version.
  8. Merge the revision committed in step 7 into the branch. Run
     "make locale-gnu-po-update". Commit.

By doing this, the po file on the trunk will contain many unused
entries, but we don't have to worry about merging the branch version
back to trunk, since these branch-only entries are already in trunk,
just marked as unused. Run "make locale-gnu-po-update" will bring
them into use.

The drawback: Many unused entries in the truck version. And you
cannot just 'svn merge -r PREV:COMMITTED some.po; svn commit -m "Merge
trunk changes"'. This may violate the rule that a branch can only
accept merges from trunk.

You may try the steps now. There are two mismatching entries between
the trunk and the branch at the writing of this post (r11187). One is
description for 'svnadmin recover', and the other is 'exported\n' in


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 30 06:01:15 2004

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.