CodeBetter.Com
CodeBetter.Com
RSS 2.0 via Feedburner
           Do you Twitter? Follow us @CodeBetter

Jeremy D. Miller -- The Shade Tree Developer

Under the hood and working with .Net, TDD, Software Design, and Agile Stuff

Little Bitty Subversion Tips

The conventional structure of a Subversion repository is this:

Root

    Branches

    Tags

    Trunk

 


If you're using CC.Net and you configure tagging, CC.Net creates a Tag in Subversion after every successful build.  If you check out from the Root, you'll potentially see hundreds of "copies" of the code tree for each CC.Net build.  Add in any possible code branches in the Branches folder, and you got a lot of code.  For that reason alone, check out and update from the Trunk folder, not the Root.

 

Secondly, you will hit merge conflicts more often early in the project, especially with project files.  Messing with the raw csproj file is messy.  I've found that the easiest way to resolve a project file conflict is to:

1.) "Revert" and use the master copy from Subversion

2.) Go add the missing files back to the project 



About Jeremy D. Miller

Jeremy began his IT career writing "Shadow IT" applications to automate his engineering documentation, then wandered into software development because it looked like more fun. Jeremy previously worked as a systems architect building mission critical supply chain software for a Fortune 100 company and learned agile development practices as a .Net consultant at ThoughtWorks, one of the pioneers of agile development. Jeremy is the author of the open source StructureMap (http://structuremap.sourceforge.net) tool for Dependency Injection with .Net and the forthcoming StoryTeller (http://storyteller.tigris.org) tool for supercharged FIT testing in .Net. Jeremy's thoughts on just about everything software related can be found on his weblog "The Shade Tree Developer" at http://codebetter.com/blogs/jeremy.miller, part of the popular CodeBetter site. Jeremy is a Microsoft MVP for C#. Check out Devlicio.us!

This Blog

Syndication

News

All opinions expressed here constitute my (Jeremy D. Miller's) personal opinion, and do not necessarily represent the opinion of any other organization or person, including (but not limited to) my fellow employees, my employer, its clients or their agents.

About Me

"Best Of" Compendium

StructureMap (Dependency Injection for .Net)

StoryTeller (Supercharged Fit)

Build your own Cab

TestDriven

MVP