Re: [Gretl-users] Getting ready for 1.5.1
On Wed, 8 Mar 2006, Sven Schreiber wrote:
Cristian Rigamonti schrieb:
> On Wed, Mar 08, 2006 at 12:19:06AM +0100, Sven Schreiber wrote:
>> While I was working on de.po (sort of offline), the cvs-version changed,
>> and when I updated my local tree, the cvs-client indicated a conflict.
>> Should I have committed before trying another update?
>
> Yes, to avoid conflicts it's best practice to commit changes as soon as they are
> finalized.
Thanks for your help; just for clarification, do you mean "don't wait
too long" or do you mean "commit first, not checking for updates before
that"?
No, you have to update first. If you try to commit when you're not
up to date with the Repository you'll just get an error message from
CVS.
I will do that tonight, I'm using poedit on win (basically the
only choice...). Could there arise any further problems if yet
another de.po update appears in the meantime, before I can merge
the changes?
Sorry for the inconvenience, but this shouldn't happen very often.
The de.po file will change -- independently of the changes you are
making -- only when I do "make update-po" in the gretl source tree.
And I do that only when we've accumulated a fair number of changes
to the gretl.pot file. (If I don't do that, the new strings will
never make it into the .po files.)
Since I think we now have all the active translators on the
gretl-users list, perhaps I should get into the habit of posting a
warning to this list when I'm doing an "update-po".
Allin.