Re: X Strike Force XFree86 SVN commit: rev 1003 - /

2004-02-19 Thread Branden Robinson
On Wed, Feb 18, 2004 at 01:04:41PM -0500, Nathanael Nerode wrote: Branden wrote: Here's the new plan. svn cp trunk branches/4.3.0/sid-branched-properly [make this branch look like revision 50 of branches/4.3.0/sid] svn ci svn merge -r 50:HEAD branches/4.3.0/sid

Re: X Strike Force XFree86 SVN commit: rev 1003 - /

2004-02-18 Thread Nathanael Nerode
Branden wrote: Here's the new plan. svn cp trunk branches/4.3.0/sid-branched-properly [make this branch look like revision 50 of branches/4.3.0/sid] svn ci svn merge -r 50:HEAD branches/4.3.0/sid branches/4.3.0/sid-branched-properly svn ci svn rm branches/4.3.0/sid

Re: X Strike Force XFree86 SVN commit: rev 1003 - /

2004-02-15 Thread Branden Robinson
On Mon, Feb 09, 2004 at 03:57:18PM -0500, Branden Robinson wrote: I think I will probably do this instead (pseudo SVN commands): Here's the new plan. svn cp trunk branches/4.3.0/sid-branched-properly [make this branch look like revision 50 of branches/4.3.0/sid] svn ci svn merge -r 50:HEAD

Re: X Strike Force XFree86 SVN commit: rev 1003 - /

2004-02-09 Thread Branden Robinson
On Wed, Feb 04, 2004 at 07:43:39PM -0500, Nathanael Nerode wrote: Basically, you just want branches/4.3.0/sid to become the trunk, right? Well, yes, but only the right way, which is by merging the changes onto the trunk. If you're not worrying about somehow trying to get the trunk history

Re: X Strike Force XFree86 SVN commit: rev 1003 - /

2004-02-06 Thread Nathanael Nerode
+p[3 February] strongThe patch audit mentioned in the a +href=/cgi-bin/viewcvs.cgi/branches/4.3.0/sid/debian/TODOTODO file/a for the 4.3.0-1 release has been completed, +thanks to the invaluable assistance of Nathanael Nerode and David Nusinow. Once the missing patches have been +

X Strike Force XFree86 SVN commit: rev 1003 - /

2004-02-03 Thread X Strike Force SVN Repository Admin
Author: branden Date: 2004-02-03 18:37:04 -0500 (Tue, 03 Feb 2004) New Revision: 1003 Modified: NEWS.xhtml Log: Add item describing patch audit completion and where things go from here. Modified: NEWS.xhtml === --- NEWS.xhtml