[Xorg] RELEASE-1 merged into CURRENT

[Keith Packard]

Around 12 o'clock on Apr 15, Egbert Eich wrote:

> I've just got done merging the RELEASE-1 branch into CURRENT.

Thanks, Egbert.

> 1. I had the usual spurious conflicts from cvs IDs. Keeping XdotOrg:
>    and XFree86: IDs in close vicinity is like calling for trouble.

We might want to change the XFree86 lines from actual CVS tags to 
something that CVS won't parse but which still retains the XFree86 version 
information:

/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */

would become:

/* Derived from XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */

Getting back to the original CVS tag would be trivial if necessary and we 
would avoid CVS accidentally rewriting the tag and losing this information.

> 3. I've used the new ChangeLog file format Keith has been proposing.
>    (I've removed the long list of files, instead I've added the 
>    ChangeLog from the RELEASE-1 branch (indented by 1).
>    If you agree on this format we need to document how to create
>    changelog files and I will convert the previous changelog entries
>    to the new format (once I've figured out how to do this without
>    too much hassle).

There is a perl script (prepare-ChangeLog.pl) available in /home/local/bin
which will walk the tree and generate a template in ChangeLog that 
includes the files and functions modified, along with the appropriate 
header line.

However, this tool traverses the entire repository, making it unsuitable 
for use in the monolithic tree as it just takes too long.  We might modify 
this script to take an optional list of sub-hierarchies to examine for 
changes.

The main benefit of this alternate format is that changes are tagged by 
date instead of a number.  This makes it possible to prepare changes on 
branches and merge them into the release without needing to hand-merge the 
change log entries and resequence them.

> 4. I will investigate how to merge the CURRENT branch into HEAD
>    without causing too much headache for others.

I don't think this will cause much trouble; no-one is using HEAD at the 
moment.  Merge at will!

-keith


-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg/attachments/20040415/538f12ab/attachment.pgp>