Subversion - Revision history

GethinWilliams: /* Modifying your Working Copy */

2014-11-07T11:24:03Z

Modifying your Working Copy

2014-11-05T14:34:12Z

To go further

2013-10-29T12:54:40Z

mkdir and copy (for branching)

2013-10-29T12:54:00Z

mkdir and copy

2013-10-28T17:00:39Z

Creating the conflict

2013-10-28T11:36:48Z

To go further

2013-10-28T11:36:28Z

To go further

2013-10-28T11:32:01Z

Modifying your Working Copy

2013-10-28T11:29:44Z

Checkout a Working Copy

2013-10-28T11:29:19Z

Checkout a Working Copy

@@ Line 116: / Line 116: @@
 </pre>
-(See, e.g. http://refcards.com/docs/gildeas/gnu-emacs/emacs-refcard-a4.pdf, if you'd like to use the emacs text editor, but are new to it.)
+(See, e.g. https://www.acrc.bris.ac.uk/acrc/pdf/emacs.pdf, if you'd like to use the emacs text editor, but are new to it.)
 To see what files you have modified, you ask the client for the status of your working copy:

@@ Line 503: / Line 503: @@
 The [http://svnbook.red-bean.com/ Subversion Red Book] is the bible of subversion. Highly recommended.
-In the book, you can see how to create your own repository, should you desire.  For example, some simple repository setup commands will provide you with a working facility via the filesystem (i.e. the repository is on the same computer that you typically work on), or SSH (i.e. you have SSH access to the machine that will host the respository).  See below.  '''However, you can also request a University of Bristol repository simply by contacting the service desk.'''
+In the book, you can see how to create your own repository, should you desire.  For example, some simple repository setup commands will provide you with a working facility via the filesystem (i.e. the repository is on the same computer that you typically work on), or SSH (i.e. you have SSH access to the machine that will host the respository).  See below.  '''However, note two things:'''
 ==Creating our own Repository==

@@ Line 462: / Line 462: @@
 * URL is the full URL of the repository. In the example, I also added "trunk/" at the end and the trunk would be created automatically.
-==mkdir and copy (for branching) ==
+==mkdir ==
 Often people ask how then can create the "branches/" directory in the repository to store some specific versions of their code. This can be done by invoking mkdir directly on the server. The syntax is:
@@ Line 468: / Line 468: @@
 $ svn mkdir URL/branches --message "Log message."
 </pre>
 ==export==

@@ Line 462: / Line 462: @@
 * URL is the full URL of the repository. In the example, I also added "trunk/" at the end and the trunk would be created automatically.
-==mkdir and copy ==
+==mkdir and copy (for branching) ==
 Often people ask how then can create the "branches/" directory in the repository to store some specific versions of their code. This can be done by invoking mkdir directly on the server. The syntax is:
@@ Line 468: / Line 468: @@
 $ svn mkdir URL/branches --message "Log message."
 </pre>
 Then you might want to create a branch of your project, for instance to call it "version1" as you start to work on version2.  Here we see that we can use copy for directories, as well as files:
@@ Line 477: / Line 476: @@
 Then you could check out URL/branches/version1 to work on version1 rather than the trunk.
 ==export==
 Sometimes, you want to get the files from the version control system but this will not be used as a working copy, for instance you are going to send the files to somebody who is not involved in the development. For instance, it is the command that was used for the [[Linux1]] and [[Linux2]] practicals.

@@ Line 338: / Line 338: @@
 As mentioned previously, conflicts arise when SVN cannot merge together changes to the same file--i.e. the changes are on the same line.
-You can manufacture a conflict using two checkouts--let's call them A and B:
+You can manufacture a conflict using two checkouts--let's call them A and B.  I could create two such working copies by typing the following:
 # Ensure that both A and B are up-to-date.

@@ Line 504: / Line 504: @@
 The [http://svnbook.red-bean.com/ Subversion Red Book] is the bible of subversion. Highly recommended.
-In the book, you can see how to create your own repository, should you desire.  For example, some simple repository setup commands will provide you with a working facility via the filesystem (i.e. the repository is on the same computer that you typically work on), or SSH (i.e. you have SSH access to the machine that will host the respository):
+In the book, you can see how to create your own repository, should you desire.  For example, some simple repository setup commands will provide you with a working facility via the filesystem (i.e. the repository is on the same computer that you typically work on), or SSH (i.e. you have SSH access to the machine that will host the respository).  See below.  '''However, you can also request a University of Bristol repository simply by emailing the service desk.'''
 <pre>

@@ Line 115: / Line 115: @@
 gethin@gethin-desktop:~/test/trunk$ emacs -nw README.md
 </pre>
 To see what files you have modified, you ask the client for the status of your working copy:

@@ Line 92: / Line 92: @@
 This command gets a copy of the content at the URL and places it in a new directory called test.  The letter "A" simply means that these files have been added to your working copy.  You'll also notice two subdirectories called '''trunk''' and '''branches'''.  This pattern follows an convention.  Usually, subversion repositories are organised so that the main strand of development is in the ''trunk''.  Sometimes it is useful to store variants of the trunk version (more of that later) and the ''branches'' folder exists to accommodate those.  (This is purely convention as far as subversion is concerned, however, and "trunk" and "branches" are merely two folders under the URL.)
-The content that you saw through your browser is now in your own file space. You may also notice hidden directories called ".svn". It is '''very''' important that you do not touch these directories.
+The content that you saw through your browser is now in your own file space. You may also notice hidden directories called ".svn". '''It is very important that you do not touch these directories.'''
 <pre>