StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

POCorrect procedure for SVN
text
Body
copied!<p>Thanks to some previous help on here with SVN I have started to make some headway with implementing SVN into our company. I am using Tortoise SVN and am just a little unsure about the correct working procedures for creating updates. This is the procedure Im currently following, but have 3 questions (shown in bold).</p> <ol> <li>When I first developed the website I created a local working directory D:\Sites{mywebsite}</li> <li>I released the website, committed everything to the trunk and created a tag called Version 1.0</li> <li>I now need to create some updates, so I've created a branch from the trunk called {my-branch} <strong>Question - whenever I want to create a branch do I have to checkout the trunk to a local working directory and then use the brancg/tag option in Tortoise? There doesnt seem to be a way of doing this with tortoise without having a local working copy.</strong></li> <li>I have used the switch command to change my local working directory from trunk to {my-branch}</li> <li>Once I'm done making all the changes to the branch and im satisfied evrything is working I need to merge branch and trunk. <strong>Question - I'm unsure what I should be doing here - am I merging trunk into my working copy (which is now a specific branch) or am I merging my branch back into the trunk?</strong></li> <li><strong>Question - once I have released the changes should I be creating another tag Version 1.1/2.0 etc?</strong></li> </ol> <p>Based on Akton's very good feedback, I am just updating the question to clarify one final point:</p> <p>1) On 1st January I create a branch called "implementation of new uploader". I check out the code to my working copy and make changes up until the 20th Jan (checking-in to the branch as I go).</p> <p>2) During this time two team members have created their own branches, released the changes and merged back into the trunk.</p> <p>3) On 1st Feb I am ready to release. On Akton's feedback, I merge the current trunk into my working copy (which is my branch). I resolve any issues and then <strong>do I commit everything back into my branch</strong>? This will now contain the two code updates that my two colleagues also merged into the branch. I wasn't sure whether my branch should now also contain other updates from other team members?</p> <p>4) Finally I merge my branch back into the trunk - but surely this should be extremely simple because my branch is now almost a mirror image of the trunk but also now contains just my updates?</p> <p>If my understand listed above is correct, I think I have it!</p> <p>Thanks for all your help.</p> <p>Regards, Al</p>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload