[Wheat-developer] Repositories In Motion

[Mark L. <ma...@gl...>]

Friends -

I have begun work on R2 -- Okay, I can't really justify it other than  
on emotional grounds, but it seems time to bump the major release  
number.

I have decided to develop this release with darcs as the source code  
control mechanism.  Here's how I see it in use:

1) On the wheatfarm.org server will be the "master" development  
repository.

2) Folks with r/w access will pull and push changes to it over ssh.

3) The world that wants to see the bleeding edge can get it over http.

4) This repository will be mirrored into sourceforge's cvs nightly  
(or more often?) in the module "r2".  No one else should ever check  
into this module.

5) Any current work in sourceforge's cvs in the module "r1" can  
continue, and I've left tags in both cvs and darcs so that I can  
**manually** incorporate those changes into the new line when ready.   
Please don't do too much of this, the "r1" module is being shutdown.

Everything except part 4 has been implemented, though I haven't tried  
to do a part 5 style integration yet...

-=-

The repos are available here:

     http://www.wheatfarm.org/repos/r2/
         - browseable source in your browser, gettable with darcs

     da...@ns...:repos/Wheat/r2
         - available if you have an authorized ssh key

If you want to get via the http version for now, you'll still be able  
to push (and pull) later via ssh.  In the mean time, you can always  
do a "darcs send" to generate a patch and e-mail it to me.

-=-

You can find out more about darcs here:

     http://abridgegame.org/darcs/

There are distributions available for most platforms.  If you need  
help with a specific one, I've done OS X, Fedora Core (via yum), and  
Windows (w/cygwin).

-=-

A good practice is to keep two repos on your local machine: one which  
corresponds to the server version, and one to work in.  To set this  
up you'd run something like this in your shell:

     cd ~
     mkdir Wheat
     cd Wheat
     darcs get --repo-name r2-main http://www.wheatfarm.org/repos/r2/
     darcs get --repo-name r2-dev r2-main

Now you'll have two directories, r2-main and r2-dev.  This way you  
can easily stage and preview patches to and from the main line:

     # getting changes
     cd r2-main
     darcs pull  # pulls from server
     ... check out the changes, see if you want 'em in your dev right  
now

     cd ../r2-dev
     darcs pull  # pull the patches from r2-main
     ... interactively pick just the ones you want



     # sending a patch
     cd r2-dev

     ... work one files ...
     darcs record
     ... perhaps do this multiple times ...

     # now decide to push
     darcs push  # pushes to r2-main
     cd ../r2-main

     ... check that all is fine ...
     darcs push  # pushes server

Of course you just work with one local repo instead of two if you  
like -- and the great thing about darcs is that any time you can  
switch to the two (or three or four...) repo version.

I've been using darcs for two months now and am quite happy with it.   
Feel free to ask me if you run into stumbling blocks.

     - Mark