SVN Page - Revision history

import>Cen1001 at 10:12, 4 June 2014

2014-06-04T10:12:33Z

← Older revision		Revision as of 10:12, 4 June 2014
Line 1:		Line 1:
			Much of this page refers to the old SVN service on wwmm which has been retired. The SVN service is now at svn.ch.cam.ac.uk, docs are at

			http://www-co.ch.cam.ac.uk/facilities/svn/

			Update URLs accordingly.

			----

	Catherine suggested that we put all the bits and pieces we learn about SVN in one place. A jolly good idea as I do tend to forget about things!		Catherine suggested that we put all the bits and pieces we learn about SVN in one place. A jolly good idea as I do tend to forget about things!

2013-05-01T12:55:34Z

Setting up your SVN details

← Older revision		Revision as of 12:55, 1 May 2013
Line 22:		Line 22:
	== Setting up your SVN details ==		== Setting up your SVN details ==

			See http://www-co.ch.cam.ac.uk/facilities/svn/
	(1) To get an account on the SVN server mail ucc-support@ch.cam.ac.uk . Say that you're from the Theory sector, which research group you're in, and if you're setting up access for the first time for a group, who else in the group needs access. You should cc your group leader on the mail. Details on how to set up svn using password authentication and how to obtain/change your password are on the [http://wwmm.ch.cam.ac.uk/wikis/wwmm/index.php/PasswordAuthSubversion wwmm wiki].

	(2) I found it convenient to define an environment variable pointing to the user and group SVN directories on the WWMM server:		(2) I found it convenient to define an environment variable pointing to the user and group SVN directories on the WWMM server:

2011-01-19T18:17:36Z

Merging branches

@@ Line 534: / Line 534: @@
 </pre>
 --[[User:am592|alston]] 16:38, 15 April 2009 (BST)
 == RSS feeds ==

2009-11-07T22:31:11Z

RSS feeds

@@ Line 537: / Line 537: @@
 == RSS feeds ==
-It is quite useful to have rss feeds for the repositories.  Even without admin access, this is still quite straightforward (with a bit of python).  I have written a python script to do this in conjunction with cron and an xlst stylesheet (slightly modified, originally from here: [http://www.codingmonkeys.de/map/log/articles/2003/10/07/svnlog-xslt codingmonkeys.de]).  The files are hosted on the alavi website, as the wiki has rather strict rules on what can be uploaded (and appears to look unfavourably on xml files).
+It is quite useful to have rss feeds for the repositories.  Even without admin access, this is still quite straightforward (with a bit of python).  A python script and a required xslt stylesheet (download from [http://www-alavi.ch.cam.ac.uk/tools/svnlogfeed.tar svnlogfeed.tar] ) makes this possible.  For each commit, it generates a highlighted diff webpage using [http://www.ginini.com/software/hdiff/ hdiff] and links to it.  Note that the supplied version of hdiff contains bug fixes by JSS.
 It is quite low-profile: files are only copied if a new commit has been made and diffs are only generated for new commits.  If a commit changes more than a certain number of files, no diff is produced (otherwise the CPU and server take a huge hammering, particularly if the commit in question is the import of an entire source tree!).
@@ Line 553: / Line 544: @@
 --[[User:jss43|james]] 16:56, 30 April 2008 (BST)

2009-08-31T22:07:18Z

Moving a directory within a repository

2009-08-06T15:29:26Z

← Older revision		Revision as of 15:29, 6 August 2009
Line 342:		Line 342:
	svn export SVN_code nosvn		svn export SVN_code nosvn
	</pre>		</pre>
	This will copy all code in SVN_code into a new directory called nosvn. This is useful if you want to move a directory within a repository. For example, to move the directory from trunk/A/DIR to trunk/B/DIR		This will copy all code in SVN_code into a new directory called nosvn. This is useful if you want to move a directory within a repository. For example, to move the directory from trunk/A/DIR to trunk/B/DIR. Using the command svn move
			is probably easier. See below.
	<pre>		<pre>
	svn export A/DIR B		svn export A/DIR B
Line 351:		Line 352:
	Done!		Done!

			== Moving a directory within a repository==

			Changing the paths within a repository is easy.
			Simply
			<pre>
			svn move A B
			svn ci
			</pre>
			--[[User:mp466\|mp466]] 16:29, 6 August 2009 (BST)
	== Reverting ==		== Reverting ==

2009-04-15T15:38:57Z

Merging specific files in a branch

← Older revision		Revision as of 15:38, 15 April 2009
Line 522:		Line 522:
	$ svn merge -r 250:HEAD https://wwmm.ch.cam.ac.uk/svn/users/jss43/project/branches/dev/dir1		$ svn merge -r 250:HEAD https://wwmm.ch.cam.ac.uk/svn/users/jss43/project/branches/dev/dir1
	</pre>		</pre>
			--[[User:am592\|alston]] 16:38, 15 April 2009 (BST)

	== RSS feeds ==		== RSS feeds ==

2009-04-15T15:38:46Z

Merging branches

@@ Line 488: / Line 488: @@
 Then, after doing the merge and fixing any conflicts, you can commit using a log message based upon ''branch.log''.
 Or, you can just use git. :-)
---[[User:jss43|james]] 21:05, 4 October 2008 (BST)
+--[[User:jss43|james]] 21:05, 4 October 2008 (BST)#
 == RSS feeds ==

2008-10-04T20:05:23Z

Merging branches

← Older revision		Revision as of 20:05, 4 October 2008
Line 478:		Line 478:

	NOTES:		NOTES:
	- Your log messages from the branch will not be included in the trunk. If you want to retain log messages use ~~GIT~~ (ask James).		- Your log messages from the branch will not be included in the trunk. If you want to retain log messages use [[git]] (ask James).
	- Or do what I do and maintain a very good Changelog file.		- Or do what I do and maintain a very good Changelog file.
	--[[User:am592\|alston]] 16:42, 3 October 2008 (BST)		--[[User:am592\|alston]] 16:42, 3 October 2008 (BST)

			Alternatively, you can produce a commit file which contains all the log messages from the branch:
			<pre>
			svn log -v -r 250:HEAD https://wwmm.ch.cam.ac.uk/svn/users/jss43/project/branches/dev > branch.log
			</pre>
			Then, after doing the merge and fixing any conflicts, you can commit using a log message based upon ''branch.log''.
			Or, you can just use git. :-)
			--[[User:jss43\|james]] 21:05, 4 October 2008 (BST)

	== RSS feeds ==		== RSS feeds ==

2008-10-04T20:00:59Z

Merging branches

← Older revision		Revision as of 20:00, 4 October 2008
Line 462:		Line 462:
	<pre>		<pre>
	cd dev/		cd dev/
	svn ~~long~~ --verbose --stop-on-copy		svn log --verbose --stop-on-copy
	</pre>		</pre>
	The log messages will stop when SVN detects the copying that had to be done to make the branch. Let's say this is revision 250.		The log messages will stop when SVN detects the copying that had to be done to make the branch. Let's say this is revision 250.