On Mon, Nov 14, 2005 at 06:15:32PM -0800, Brad Templeton wrote: > > I've been away from mythtv coding for several months. I see it has > switched to subversion. I've always had my own custom patches, some > of which I contributed, some of which were not ready or suitable > for contribution. > > I'm surprised I see little docs on how to convert a checked out > package from cvs to svn. Is it so obvious that it's just not > documented? > > If the cvs were still available I could do a cvs diff with the version > around the time of my last update (June) and then check out a new > working dir from svn and apply them, but the cvs server does not > respond. Is there a simpler way to do this?
As the others have said, checkout svn version corresponding to your cvs version. I would suggest you can just do a diff between the svn version and the cvs version and make sure you add --exclude=CVS --exclude=.svn to the diff. As for keeping your own series of patches that are always applied to myth. I've come to love quilt for this purpose. At any given time I have 4-10 patches in my patch quilt. For each problem I want to fix I make a new patch in the quilt, edit the files under quilt and get quilt to refresh the patch. Then I can attach the patch to a ticket in trac and wait for it to be applied. Each time I update to the most recent svn it is a simple process. quilt pop -a (removes all my patches) svn update quilt push The quilt push is repeated for each patch, if the patch applies cleanly I just move on, if it applies with fuzz factors it's time to refresh the patch (quilt refresh). If it has conflicts, it's either because my patch has been committed upstream, in which case I remove it from the patch quilt, or because a commit has significantly changed the same area as the patch, in which case I need to update my patch by hand. Well worth taking the time to learn it. Stuart
_______________________________________________ mythtv-dev mailing list [email protected] http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-dev
