> Here's a problem I've been pondering that maybe someone here knows a good
> method for tackling:
>
> I find revision control extremely handy when I'm coding, primarily due to
> the way it lets me atomize and roll back changes I've made (assuming that
> I commit frequently). This has a major impact on my ability to quickly
> isolate bugs I've introduced. :)
>
> Anyway, Rodney uses the VASSAL project CVS repository differently than I
> use my personal ones---accepted changes go there, while what I want is
> a place for tracking my own development history. More specifically:
>
> 1. I want to keep a record of my changes.
> 2. I want to periodically sync my repository with the project one, which
> uses CVS.
> 3. I want to use Subversion myself.
>
> Does anyone know of a simple way to do this?
The simple solution is to convince Rodney to convert to SVN, and then just
create branches :D However...
When you say sync, what exactly do you mean? Do you want to import all
the CVS revisions into your SVN repo, or is it acceptable to get the HEAD
revision of CVS into your SVN repo.
cvs export and svn export may be your answer. Try this:
Create your own SVN repo.
Do a "cvs export" from rodney's cvs repo. This will get all the files of
the CVS repo without the administrative directories for cvs.
Then do a "svn import" (or "svn add" followed up with a commit) to get
these files into your repo. Keep the CVS repository in the trunk of your
SVN repo.
>From there you create your own branch.
then... Make changes, commit, repeat...
When you have "accepted changes" do a "svn export" from your local SVN
repo branch to a working copy of the CVS repo. Then do an cvs commit.
Oh, and if you're making changes, and you want to merge in changes that
Rodney's made on CVS while you're in the middle of your own changes you
would:
check out your SVN repo trunk
export CVS into your working copy of SVN's trunk
commit these changes to your trunk
switch to your branch
do a svn merge from the previous SVN trunk to the new SVN trunk.
it should intellegently merge in the changes from rodney
There are tools for creating CVS to SVN, but those really operate on the
repos themselves, and are meant to convert only once (not to go back and
forth)
Cheers
-Tim
Yahoo! Groups Links
<*> To visit your group on the web, go to:
http://groups.yahoo.com/group/vassalengine/
<*> Your email settings:
Individual Email | Traditional
<*> To change settings online go to:
http://groups.yahoo.com/group/vassalengine/join
(Yahoo! ID required)
<*> To change settings via email:
mailto:[EMAIL PROTECTED]
mailto:[EMAIL PROTECTED]
<*> To unsubscribe from this group, send an email to:
[EMAIL PROTECTED]
<*> Your use of Yahoo! Groups is subject to:
http://docs.yahoo.com/info/terms/
