Patches for 7.0 RC

[Daniel Stone]

On Thu, Nov 03, 2005 at 01:07:38PM -0800, Kean Johnston wrote:
> I am working on a set of patches to update the SCO ports (finally)
> for 7.0. I missed the boat with 6.8.2 and hope to get these in.
> I did a checkout of the tree using XORG-6_99_99_901 as the tag,
> but now when I try to do a 'cvs add' of some files, so that the
> diff will be correct, I get the error:
> 
> cvs add: cannot add file on non-branch tag 'XORG-6_99_99_901'
> 
> So my question is, what tag should I have my sources checked out
> on for the 7.0 release (I will be submitting different patches
> for HEAD), and how do I add files?

The problem is that XORG-6_99_99_901 is a tag, not a branch.  A tag is
not a line of development or a moving target; it is merely a point in
time.  You can update tags on a per-file basis, but you have to commit
to HEAD first, then manually bump the tag on the file.

Branches are handled differently, and you can add/remove/commit on a
branch, because it is a distinct line of development.  But this is not
the case with tags, which are merely signposts along the way, if you
like.

If you're adding new files, it might be easiest to just cvs diff, and
then attach the diff of the new files.  But sending patches against
HEAD would be even better.

Cheers,
Daniel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg/attachments/20051104/f31b711b/attachment-0001.pgp>