Re: CVS commit error

[dooteo <dooteo euskalgnu org>]

Hi,

update gpdf module (-z3 up -Pd), and ChangeLog's first lines are:

<<<<<<< ChangeLog
2003-12-05  Iñaki Larrañaga  <dooteo@euskalgnu.org>

	* eu.po: Updated Basque translation.

=======
2003-12-04  Žygimantas Beručka  <uid0@tuxfamily.org>

	* lt.po: Updated Lithuanian translation.

2003-12-03  Sanlig Badral <badral@openmn.org>

	* mn.po: Updated Mongolian translation. 

>>>>>>> 1.276

So, could I delete those lines?

<<<<<<< ChangeLog
=======
>>>>>>> 1.276

and after, make a commit of changeLog file?

Thanks and regards,

Dooteo

Jatorrizko mezua: data: or., 2003-12-05 02:23, egilea: Malcolm
Tredinnick
> On Fri, 2003-12-05 at 11:39, dooteo wrote:
> > Hi, 
> > 
> > Once  gpdf's eu.po file was commit, trying to do the same with
> > "ChangeLog' file it gives me this error:
> > 
> > cvs comit: Up-to-date check failed for 'ChangeLog'
> > cvs [commit aborted]: correct above errors first!
> > cvs commit: sabving log message in /home/dooteo/tmp/cvsB3Lzxb
> 
> It is telling you that the ChangeLog file has been changed at the
> repository (by somebody else committing a change) since you last did a
> 'cvs update'. So you need to 'cvs update ChangeLog' first , fix any
> conflicts (because you changed the top of the file, as did the previous
> committer, CVS will become confused about which order the changes should
> go in -- it is pretty easy to fix by hand, though) and then commit your
> changes.
> 
> Malcolm
> 
> _______________________________________________
> gnome-i18n mailing list
> gnome-i18n@gnome.org
> http://lists.gnome.org/mailman/listinfo/gnome-i18n