[Box Backup-dev] Where to put my bug fixes?

Chris Wilson boxbackup-dev@fluffy.co.uk
Mon, 7 Aug 2006 21:26:34 +0100 (BST)


Hi Nick,

> I am more than happy to - but I am not sure I have the most to 
> contribute here, Chris and Martin appear to be heavily involved in how 
> SVN works - and I suppose it would be good to understand how your 
> branching and everything SVN works first...

Quick guide to Subversion:

Install the Windows Subversion client command-line tools from 
[http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91]

Make sure they are in your path. You should be able to run "svn" from the 
command line.

To create a new branch from scratch:

 	svn mkdir http://bbdev.fluffy.co.uk/svn/box/nick

To copy an existing branch, creating a new one:

 	svn cp http://bbdev.fluffy.co.uk/svn/box/chris/general
 		http://bbdev.fluffy.co.uk/svn/box/nick/personal

To check out your new branch as a local working copy:

 	svn co http://bbdev.fluffy.co.uk/svn/box/nick/personal
 	(creates a directory called "personal" under the current directory
 	where you run the command)

To commit changes to your working copy to the branch where it belongs:

 	svn ci .

To show differences between your working copy and the version you checked 
out:

 	svn diff

To show differences between two branches:

 	svn diff http://bbdev.fluffy.co.uk/svn/box/chris/general
                 http://bbdev.fluffy.co.uk/svn/box/nick/personal

To update your local working copy:

 	svn update

To switch a working copy to a new branch:

 	svn switch http://bbdev.fluffy.co.uk/svn/box/nick/personal

For more information about how SVN works, and the available commands, 
please see [http://svnbook.red-bean.com/]

I'd recommend that you create a new personal branch for yourself as above, 
based on mine, commit your changes, and then tell me so that I can review 
them and commit them to my branch, where I can look after merging them for 
you.

Cheers, Chris.
-- 
_ ___ __     _
  / __/ / ,__(_)_  | Chris Wilson <0000 at qwirx.com> - Cambs UK |
/ (_/ ,\/ _/ /_ \ | Security/C/C++/Java/Perl/SQL/HTML Developer |
\ _/_/_/_//_/___/ | We are GNU-free your mind-and your software |