Re: Xorg CVS "XORG-6_8-branch" is now open for landing of approved X11R6.8.2 patches...

On Sat, 13 Nov 2004 01:40:04 +0100, Roland Mainz
<[email protected]> wrote:
> 
> Hi!
> 
> ----
> 
> The Xorg CVS branch "XORG-6_8-branch" is now open for the landing of
> patches which have been approved for the X11R6.8.2 maintaince release,
> e.g. if they have the bugzilla attachment flag "approval_X11R6.8.x" set
> to '+' (which means "approval granted". Any other flag value like '-'
> (="approval denied") or (="requesting approval") means you are not
> allowed to commit the patch).
> I've just made a checkout of the XORG-6_8-branch branch and verified
> that the content is (almost - see below for the issue with bug 1220)
> identical to the tarball downloaded from
> 'http://freedesktop.org/~xorg/X11R6.8.1/src-single/X11R6.8.1-src.tar.bz2'.
> 
> * Known problems:
> Original plan was to make an "start" tag to mark the begin of the
> X11R6.8.2 committing process to allow people to generate diffs (between
> the "start" tag and the final X11R6.8.2 tag) to simply patch their own
> trees (instead of buld everything from scratch). However it seems that
> the patch for https://freedesktop.org/bugzilla/show_bug.cgi?id=1220 was
> commited after X11R6.8.1 was tagged so such a tag would be more
> confusing than usefull (the risk is that the patch for bug 1220 may be
> skipped (I am not really happy about the post-X11R6.8.1-commit - but the
> patch seems to be usefull for the maintaince release so I have requested
> "post-commit" approval to get it approved by release-wranglers, too)),
> therefore I have obmitted this tag.

Sorry about that.  When I applied the patch to HEAD several developers
suggested I also commit it to the stable branch since it fixed an
annoying bug in the driver.  I wasn't sure what the policy was
regarding that branch and when I asked on IRC I was told the patch was
a reasonable one for the stable branch and should be applied.  This
was all prior to the recent discussions regarding a 6.8.2 release and
the stable branch in general.  Now that we have a process for the
stable branch, I will follow it.

Alex

> 
> * The current list of bugs with approved patches can be found under
> https://freedesktop.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=xorg&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Bug+Number&field0-0-0=flagtypes.name&type0-0-0=substring&value0-0-0=%2B
> (I'm trying to get a better URL for that which actually lists the
> approved attachments itself and not only the bugs).
> 
> The list of pending requests can be found under
> https://freedesktop.org/bugzilla/request.cgi?action=queue&requester=&product=&type=approval_X11R6.8.x&requestee=&component=&group=type
> (we're half way through the list of patches (monday's release-wranglers
> call should be faster as some patches can be bundeled together :)).
> 
> * Doing commits to the branch:
> 1. Pull source
> % export CVSROOT=:ext:myaccount-fPHQoQgdw3yvj1b/[email protected]:/cvs/xorg
> % export CVS_RSH=ssh
> % cvs -z6 checkout -r  XORG-6_8-branch xc
> 2. Apply patch
> 3. Add entry in "xc/Changelog"
> 4. Compile
> 5. Test
> 6. Commit
> 7. Edit attachment, add the string "[FIXED_XORG6.8.x]" to the patch
> "description" (_not_ the "comment" input box) field (that way the
> release-wranglers can see whether a patch has been checked in via
> looking at the attachment description) and paste the output of "cvs
> commit" into the comment field.
> 
> Comments/questions/etc. welcome! :)
> 
> ----
> 
> Bye,
> Roland
> 
> --
>   __ .  . __
>  (o.\ \/ /.o) [email protected]
>   \__\/\/__/  MPEG specialist, C&&JAVA&&Sun&&Unix programmer
>   /O /==\ O\  TEL +49 641 7950090
>  (;O/ \/ \O;)