[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Eric goes to lunch -- a decentralized-development user story

From: John Peacock <jpeacock_at_rowman.com>
Date: 2004-09-16 21:41:48 CEST

Eric S. Raymond wrote:
> Now things are better. Before bicycling to lunch, Eric ran a one-line
> shellscript that uses rsync to update a local copy of the gpsd
> repository on his laptop:
>
> rsync http://svn.berlios.de/svnroot/gpsd ~/svn/gpsd/SVN

[first time only]

        svk mirror //gpsd/trunk http://svn.berlios.de/svnroot/gpsd
        svk cp //gpsd/trunk //gpsd/local/trunk

[every other time, get up-to-date changes]

        svk sync //gpsd/trunk

[check for conflicts]

        svk smerge -C //gpsd/trunk //gpsd/local/trunk

[and automatically merge if no conflicts]

        svk smerge //gpsd/trunk //gpsd/local/trunk

>
> As he eats lunch, he does commits to that local repository. When he
> gets within range of his wireless net again, he runs another one-line
> shellscript from within his working-copy directory that does this:
>
> svn sync http://svn.berlios.de/svnroot/gpsd

        svk smerge -C //gpsd/local/trunk //gpsd/trunk
        svk smerge //gpsd/local/trunk //gpsd/trunk
        svk sync //gpsd/local/trunk

>
> This ships all the commits he did over lunch to the repo in Germany.
> Then he closes his laptop, sits down at his desk, and types "svn
> update" at the keyboard of his desktop machine.
>

Sure, it is a few extra lines, but there is already a way to do _exactly_ what
you want. Since this is your own repository, you can even skip the local/trunk
and do all of your work in the mirrored location itself and the sync will do the
right thing when you are reconnected.

John

-- 
John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4720 Boston Way
Lanham, MD 20706
301-459-3366 x.5010
fax 301-429-5747
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 16 21:41:44 2004

This is an archived mail posted to the Subversion Dev mailing list.