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

[Werner Hoch]

Hi DJ,

On Monday 11 December 2006 19:55, DJ Delorie wrote:
> 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)

Thanks for the hint, sounds reasonable.

I plan to merge the autonumber branch tomorrow.

I hope it's ok to merge it in before the glist_dev as there are still 
some ongoing discussions.

Regards
Werner