gEDA-dev: cvs merging: how to merge ChangeLog files

[DJ Delorie]

> What shall I do with the ChangeLog entries from the branch when merging 
> back to the trunk?

The general rule in gcc-land is to create one ChangeLog entry for your merge,
which contains the ChangeLog entries you are merging.  Like this:

2006-12-11  DJ Delorie  <dj at delorie.com>

	    Merge of foo branch.

	    2006-11-15  DJ Delorie  <dj at delorie.com>
	    * src/hid.h: ...

	    2006-10-07  Ales Hvezda <ahvezda at seul.org>
	    * gschem/foo.c: ...

2006-12-10  ....  (older mainline entries)