Re: X Strike Force XFree86 SVN commit: rev 1003 - /
+ <p>[3 February] <strong>The patch audit mentioned in the <a
+ href="/cgi-bin/viewcvs.cgi/branches/4.3.0/sid/debian/TODO">TODO 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
+ forward-ported, I will either release 4.3.0-0pre1v6 to experimental, or
4.3.0-1 to unstable. The deciding factor
+ will be how much work it is to merge <code>branches/4.3.0/sid</code> onto
the <code>trunk</code> in SVN. (The
+ problem is that the branch wasn't "properly" branched in the first place,
but rather an import by Daniel Stone of
+ work he had done outside revision control -- at the time he did it, the
XSF SVN repository did not even exist.) I
+ don't want people to have to wait simply while I do repository
housekeeping, so if it looks like this will take a
+ long time, I will release 4.3.0-0pre1v6 to experimental to tide people
over.</p>
Basically, you just want branches/4.3.0/sid to "become" the trunk, right? If
you're not worrying about somehow trying to get the trunk history attached to
the branch (and my advice is: don't, as it will mess up the *branch*
history), then I believe there's a very straightforward, if moderately
demented, way of doing this in SVN:
svn mv trunk branches/old-trunk
svn cp branches/4.3.0/sid trunk
svn commit
The wonders of versioned renames and moves. :-)
Reply to: