views:

20387

answers:

11

What is a trunk, branch and tag in subversion and what are the best practices to use them.

What tools I can use for subversion in Visual Studio 2008?

+5  A: 

Great place to start learning about subversion.. http://svnbook.red-bean.com/

As far as VS tools are concerned I like AnkhSVN but I haven't tried the VisualSVN plugin yet.

VisualSVN does rely on TortoiseSVN, but Tortoise is also a nice compliment to Ankh IMHO.

Quintin Robinson
Where did you get the notion that Ankh relies on Tortoise? Afaik that is not the case, only for VisualSVN.
Joey
I don't know where I got that impression but I did think it was required. In either case I think it's nice to have Tortoise as a compliment, but thanks for making me look into it!
Quintin Robinson
I have ankh installed without tortoise.
Hemanshu Bhojak
A: 

As for tools see:

This Post

A: 

Read http://svnbook.red-bean.com/nightly/en/svn-book.html for details of the recommended SVN directory layout.

anon
+2  A: 

A trunk is considered your main code base, a branch offshoot of the trunk. Like, you create a branch if you want to impliment a new feature, but dont want to affect the main trunk.

Tortoise has good docs, and a great diff tool:

http://tortoisesvn.net/docs/release/TortoiseSVN_en/index.html

I use Visual studio, and I use VisualSvn and tortoise.

Mike_G
+3  A: 

To use subversion in VS2008, install tortoise and ankh.

TortoiseSVN is a really easy to use Revision control / version control / source control software for Windows. Since it's not an integration for a specific IDE you can use it with whatever development tools you like. TortoiseSVN is free to use. You don't need to get a loan or pay a full years salary to use it.

AnkhSVN is a Subversion SourceControl Provider for Visual Studio. The software allows you to perform the most common version control operations directly from inside the Microsoft Visual Studio IDE. With AnkhSVN you no longer need to leave your IDE to perform tasks like viewing the status of your source code, updating your Subversion working copy and committing changes. You can even browse your repository and you can plug-in your favorite diff tool.

gimel
A: 

A good book in Subversion: Pragmatic Version Control using Subversion, where is explained your question and gives a lot more information.

eKek0
+1  A: 

If you're new to subversion you may want to check out this post on SmashingMagazine.com, appropriately titled: Ultimate Round-Up for Version Control with SubVersion

It covers getting started with SubVersion with links to tutorials, reference materials, & book suggestions.

It covers tools (many are compatible windows) and it mentions AnkhSVN as a Visual Studio compatible plugin. The comments also mention VisualSVN as an alternative.

Kevin Williams
+29  A: 

The trunk is the main line of development in a SVN repository.

A branch is a side-line of development created to make larger, experimental or disrupting work without annoying users of the trunk version. Also, branches can be used to create development lines for multiple versions of the same product, like having a place to backport bugfixes into a stable release.

Finally, tags are markers to highlight notable revisions in the history of the repository, usually things like "this was released as 1.0".

See the HTML version of "Version Control with Subversion", especially Chapter 4: Branching and Merging or buy it in paper (e.g. from amazon) for an in-depth discussion of the technical details.


I use TortoiseSVN but no Visual Studio integration. I keep the "Check for modifications" dialog open on the second monitor the whole time, so I can track which files I have touched. But see the "Best SVN Tools" question, for more recommendations.

David Schmitt
I guess ankh is the best for me. I can do almost everything from right within visual studio. Thanks!!!
Hemanshu Bhojak
+1  A: 

A fantastic free utility to use if you have a team of developers is SVN Monitor. It serves as a heartbeat for your tree, telling you when there are updates, possible conflicts, etc. It's not quite as useful for a solo developer though.

swilliams
+2  A: 

The "trunk", "branches", and "tags" directories are conventions in Subversion. Subversion does not require you to have these directories nor assign special meaning to them. However, this convention is very common and, unless you have a really good reason, you should follow the convention. The book links that other readers have given describe the convention and how to use it.

Peter Neubauer
A: 

The answer by David Schmitt sums things up very well, but I think it is important to note that, to SVN, the terms 'branch', 'tag', and 'trunk' don't mean anything. These terms are purely semantic and only affect the way we, as users of the system, treat those directories. One could easily name them 'main', 'test', and 'releases.'; As long as everyone using the system understands how to use each section properly, it really doesn't matter what they're called.

KOGI
Yeah it's true. Subversion does not restrict you with such naming conventions. Its just a recommendation. Thanks for your answer, it helped.
Hemanshu Bhojak