Hi folks,

small thing: some of you don't use the ChangeLog entry for the commit message. I just made a `cvs log ` accidently and saw, that the log only includes the ChangeLog entry sporadically.

A small example (gimp.xml):

(wrong) revision 1.163
date: 2006/06/24 20:46:08; author: marcoc; state: Exp; lines: +3 -3 Added italian content and fixed some errors
(correct)
revision 1.161
date: 2006/06/21 21:52:33; author: nshmyrev; state: Exp; lines: +2 -2 2006-06-22 Nickolay V. Shmyrev

* src/dialogs/brushes-dialog.xml: * src/dialogs/dialogs-content.xml: * src/gimp.xml: added russian content.

So, please use for each CVS commit your ChangeLog entry :)

Thanks,

On Wed, Sep 20, 2006 at 10:05:40AM +0200, Axel Wernicke wrote:

so you are talking about the Changlog commits only right? The commit message for all the other files describes the changes in that particular file, not the message for the batch commit at all?!

No - I mean the whole commit (the batch in your words) not only the ChangeLog. The ChangeLog entry should tell what you have changed on the files.

Greetings :)

On Wed, Sep 20, 2006 at 11:41:37AM +0200, Marco Ciampa wrote:

Lets try do reproduce the problem. I usually do:

1) update local repo: cvs up 2) do some modifications on files: emacs src/gimp.xml 3) update Changelog: emacs Changelog 4) commit: cvs commit -m "Updated XX translation"

What is wrong?

Point 4. Use your Changelog entry for the commit message. You may also want to have a look at one of the files (e.g cvs log gimp.xml)

Greetings,

On Wed, Sep 20, 2006 at 01:03:53PM +0200, Axel Wernicke wrote:

Hi Roman,

sorry I don't get it. The way I set the commit message to date is:

a.xml -> added german translation b.xml -> added german translation

Changelog -> 2006-09-10 lexA:
* a.xml
* b.xml: added german translation

Shouldn't it be this way?

Thats correct, but the problem isn't about the ChangeLog entry, it's about the commit message. Have a look a the reply to Marcos mail :)

Greetings,

On Wed, Sep 20, 2006 at 03:42:25PM +0200, Axel Wernicke wrote:

1) update local repo: cvs up
2) do some modifications on files: emacs src/gimp.xml 3) update Changelog: emacs Changelog 4) commit: cvs commit -m "Updated XX translation"

What is wrong?

Point 4. Use your Changelog entry for the commit message. You may also want to have a look at one of the files (e.g cvs log gimp.xml)

I do not have a Changelog entry at this point. The change log entry is generated from the log that is generated when commiting the files !?! It does not make sense to describe the changes in a.xml AND b.xml in the commit message from a.xml. Does it?

Hm.. no...

Let me try to explain it again.

You don't checkin every file which you have changed for itself. You check in all your changes together. To document what has changed, you create before you're checking in your changes a ChangeLog entry. After you created the ChangeLog entry, you checkin your changes.

At this point you can provide a message via the -m option or an editor pops up (at least thats the usual procedure I get). For this checkin message you use your last ChangeLog entry.

So, don't checkin every single file. Checkin all your changes and use the last ChangeLog entry for this.

Greetings,

On Thu, Sep 21, 2006 at 12:06:26PM +0200, Marco Ciampa wrote:

On Thu, Sep 21, 2006 at 09:27:12AM +0200, Roman Joost wrote:

So, don't checkin every single file. Checkin all your changes and use the last ChangeLog entry for this.

Many thanks for clarifying this point.

Just for the sake of curiosity: is it a gnu/gnome/? habit?

Guess so - just learned it from Daniel Egger when I joined the project ;)

Greetings,