Re: erratic commit records?

[Karl Eichwalder <ke gnu franken de>]

Sven Neumann <sven gimp org> writes:

> If there are conflicts in a po file and you happen to have your edited
> version before cvs merged in the changes done in the repository, don't
> even try to resolve conflicts manually.

Yes, that's the way to go.  Note, in case of a conflict, cvs will move
your file to .#xxxxx.VERISON.

> Instead, remove the file with conflicts, cvs update again to get the
> version that's in CVS. Then, use msgmerge to merge the two files.

Yes, that's one possibility - use it, if the server side .po file was
committed by a developer (= only filemane references changed).
Sometimes it is better to use msgcat.  msgcat will concatenate your and
your co-translator's translation into one entry and flag it fuzzy; then
you can take a look and pickup the best version.  If you know for sure
your version is the best, use the --use-first flag ;)

    mv vi.po vi-cvs.po
    msgcat -o vi.po --use-first .#vi.po.VERSION vi-cvs.po

The 'mv' is necessary because msgcat cannot update a .po file in place,
AFAIK.  Check vi.po as usual and finally commit it.

-- 
http://www.gnu.franken.de/ke/                           |      ,__o
                                                        |    _-\_<,
                                                        |   (*)/'(*)
Key fingerprint = F138 B28F B7ED E0AC 1AB4  AA7F C90A 35C3 E9D0 5D1C