Re: Why do maintainers "sync" po files in cvs?

[Ãsmund SkjÃveland <aasmunds fys uio no>]

> It's not like a conflict in source code because it is a lot easier to
> resolve a conflict in a po file caused by 'make dist'. Just throw away
> the version from CVS and replace it with your uptodate po file. cvs
> keeps a copy of your original file in case of conflicts. So all you
> need to do in order to resolve the conflict is typing
> 'mv <lang>.po.orig <lang>.po'.

My CVS makes .#nn.po.1.76 and suchlike. (Which I didn't know about, 
this'll make things a lot easier the next time somebody's gettext 
decides to reformat every bloody msgstr.) The CVS info pages don't 
mention any .orig files, AFAICS.

--
Å. Skjæveland