[Xorg] RELEASE-1 merged into CURRENT

[Keith Packard]

Around 11 o'clock on Apr 20, Egbert Eich wrote:

> Well, we may see stuff go into branches which may never go into the
> trunk.

That's the nice thing about using the common ChangeLog; if those changes 
don't get merged onto HEAD, then the ChangeLog entries won't get merged 
either.  The ChangeLog entries should get merged along with the affected 
files; that way everything tracks together.

> > That would leave your nice hierarchical 
> > ChangeLog format and not require separate ChangeLog files for each branch.
>
> Right. I wouldn't mind to have all this automated either.
> However my Perl skills are limited and I'm a little reluctand
> to do this in awk.
> Any volunteer?

I can try and poke at the prepare-ChangeLog.pl script, but I will admit 
that I know no more perl than you.  I'm afraid too much of our 
infrastructure is starting to rely on a language that none of us want to 
learn...

-ketih


-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
Url : http://freedesktop.org/pipermail/release-wranglers/attachments/20040420/6284271e/attachment.pgp