Re: svn commit: r11126 - branches/1.1.x/subversion/po

Erik,

I'm trying to use GNU's 'msgmerge' instead of 'svn merge' to merge
the changes of a PO file from trunk to branch, but I still didn't
have success.

My idea is to run something like:

  1) run locale update in trunk;
  2) update PO file in trunk;
  3) run locale update in branch;
  4) bring changes from trunk to branch using 'msgmerge';
  5) run locale update again to mark obsolete messages;
  6) remove obsolete messages;

No success up to now, but maybe that's the way to go. For the last
updates I had to use direct branch commit. It was easy for me to
update the branch first.

Any ideas?

Marcos

_________________________________________________________________
MSN Messenger: converse com os seus amigos online.
http://messenger.msn.com.br

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Sep 25 23:31:16 2004