My recent spate of typo patches has left me with a bit of a dilemma. Typo is managed using the Subversion version control system. That’s great–Subversion is quite nice–except I don’t have (and don’t really want) commit privileges to the master Typo SVN repository. I can check things out and edit them, and use Subversion to make patches, but once my patches start piling up, I’m left without any form of local version control. I can’t tell my patches apart, and there’s no easy way for me to merge my patches with other changes without totally losing control of which change goes with which patch.
This has to be a fairly common problem–a lot of open-source software is developed using Subversion these days, and CVS has similar problems. I could just set up my own Subversion repository for Typo changes, but syncing it with the upstream tree will be a pain.
Does anyone have any “best practices” suggestions?
The only thing that I see online that might be helpful is Submaster, but it’s full of comments like this:
WARNING: This is just a proof-of-concept implementation. Don’t use it in production environments! You have been warned!
NOTE: This version of SubMaster is written for Subversion 0.35.0. It might not work with any other version of subversion as it is now.
That doesn’t instill confidence.
Update: I gave Submaster a brief spin this morning. I was able to create a Submaster repository, but I was unable to check changes into the local repository without getting errors from
svn. I suspect that it has problems with Subversion 1.2.
Since that doesn’t look like it’ll work, I’m going to give SVK a try. The short tutorial on the SVK wiki makes it look pretty simple. It’s currently cloning 272 revisions out of the Typo SVN tree; hopefully it’ll actually work right once it’s done.
Update 2: This is continued in a new article.