Hi!

If I understand right, this should be a save way:

1. copy modified files to cvs directory
(I normally make my changes directly in the cvs-dir)
2. update from cvs
3. check for merging conflicts (e.g. by recompiling) and repair them
4. commit all modified files

In addition I currently update again after this and check the cvs output if any file is still marked as Modified (which could mean that I forgot to commit it).

bye,

Stefan

Hi,

I'm not absolute sure about this topic but have noticed some things when updating from cvs.

1. Few days ago Shane stated that he had to comment out a line related to TTrackbar in gtkobject. Seems as if he overwrote some of the changes I made a couple of hours before he committed.

Q: How can this happen and how can we avoid it?

2. Somebody has created empty log messages in the last few days. I'd suggest to always make a short log entry because these can help a lot when something suddenly goes wrong.

3. I've updated from cvs on 22/09/99 and 23/09/99. With both updates I got a new version of gtkobject.inc.

Q: Can anybody explain me why there was a log entry for v1.50 in this file present in the 22/09/99 sources but has disappered in the 23/09/99 sources?

bye,

Stefan

A: to avoid, copy first your fixed file to the cvs directory, then run cvs update to update your file also with the latest changes from other ppl. And then you can finaly commit

2. Somebody has created empty log messages in the last few days. I'd suggest to always make a short log entry because these can help a lot when something suddenly goes wrong.

Nothing to answer here :)

A: someone updated the cvs files and then copied his own version to the cvs directory and then commited that version.