Showing posts with label SVN. Show all posts
Showing posts with label SVN. Show all posts

Wednesday, November 02, 2011

Don't be difficult, DiffMerge! Using the free DiffMerge with SourceSafe, TFS & SVN

The Mooney Project - How to use SourceGear DiffMerge in SourceSafe, TFS, and SVN

"What is DiffMerge

DiffMerge is yet-another-diff-and-merge-tool from the fine folks at SourceGear. It’s awesome. It’s head and shoulders above whatever junky diff tool they provided with your source control platform, unless of course you’re already using Vault. Eric Sink, the founder of SourceGear, wrote about it here. By the way, Eric’s blog is easily one of the most valuable I’ve read, and while it doesn’t get much love these days, there’s a lot of great stuff there, and it’s even worth going back and reading from the beginning if you haven’t seen it.

Are there better diff tools out there? Sure, there probably are. I’m sure you have your favorite. If you’re using something already that works for you, great. DiffMerge is just yet another great option to consider when you’re getting started.

You sound like a sleazy used car salesman

Yeah, I probably do, but I don’t work for SourceGear and have no financial interest in their products. I’ve just been a very happy user of Vault and DiffMerge for years. And it if increases Vault adoption, both among development shops and development tool vendors, it will make my life easier.

But when I go to work on long-term contracts for large clients, they already have source control in place that they want me to use, which is OK, but when I need to do some merging, it starts getting painful. I want it to tell me not just that a line changed, but exactly what in that line changed. I want to it actually be able to tell me the only change is whitespace. I want it to offer me a clean and intuitive interface. Crazy, I know.

Not a huge problem because DiffMerge is free, and it can plug into just about any source control system, replacing the existing settings. However those settings can be tricky to figure out, so I figured I’d put together a cheat sheet of how to set it up for various platforms.



I think it's pretty lame of me that I've been following DiffMerge since at least June 2007 (when I first blogged about it) but STILL haven't taken these steps to use it with TFS. Sigh... bad dev... bad dev... [Note to Self: Self's don't let Self's use the old SourceSafe/TFS Merge tool! The next time you merge, take a few seconds and replace that beast! (Good news is that MS is also replacing it in TFS11...)]


Related Past Post XRef:
SourceGear DiffMerge - Free Cross Platform GUI Diff & Merge Utility

Sunday, August 14, 2011

"Version Control By Example" free dead tree version... as in hold in your hand, free (you don't even have to pay for shipping), printed book

Eric Sync - Free Printed Copies of "Version Control by Example"

"The printed copies of Version Control by Example arrived last week. We moved seven tons of books into our fourth-floor office space and all the tenants on the third floor are still alive.

Now that we have lots of copies, I want to give a bunch of them away.

How do I get one of those free books?

Fill out our book request form at:


Do I have to pay for shipping?


What if I'm outside the United States?

No problem.

I'd prefer to pay for the book. Will the request form accept a credit card number?


Don't you at least have a tip jar?



Why are you giving away books?

Because I want to make this content accessible to more people. Some people like paper. Not everyone reads blogs.



I don't know about you, but I find it hard to read technical books in ebook form. I page around, flip back and fourth, highlight stuff, etc., etc. enough that reading them in PDF or on my Kindle just doesn't work well for me. So while I've already got the PDF version of this book, when I saw that I could get a dead tree version free, as in free, I was a form filling out fool... ;)

I had to laugh at both this post and the form. Go fill it out and you'll see what I mean. Not the usual "marketing" type question phrasing... lol


Related Past Post XRef:
“Version Control By Example” - Free ebook from Eric Sync (Think “226 pages focusing on DVCS, GIT, Mercurial, Veracity and SVN”)

Monday, July 25, 2011

“Version Control By Example” - Free ebook from Eric Sync (Think “226 pages focusing on DVCS, GIT, Mercurial, Veracity and SVN”)

Eric Sync - Version Control by Example


About the book

This book uses practical examples to explain version control with both centralized and decentralized systems. Topics covered include:

  • Basic version control commands and concepts
  • Introduction to Distributed Version Control Systems (DVCS)
  • Advanced branching workflows
  • Strengths and weaknesses of DVCS vs. centralized tools
  • Best practices
  • How distributed version control works under the hood

Featuring these open source version control tools:

  • Apache Subversion
  • Mercurial
  • Git
  • Veracity

Here my usual PDF snap (so you can get a feel for the contents and proof that it’s downloadable  ;)


(via Eric Sink - Version Control by Example)

Thursday, January 27, 2011

RocketSVN fly's to freedom. RocketSVN Server/RocketSVN for VS now free (as in free) and open sourced too!

Ship Software on Time - RocketSVN Server and RocketSVN for VS Now Free

"I’m excited to announce that we have decided to make both RocketSVN Server (Subversion Server for Windows) and RocketSVN for VS (SVN add-in for VS) 100% free. Indefinitely. For unlimited users


While we have been doing great additions to both open source projects (Ankh and Subversion), we decided it was important not to charge for the work we’ve done. We’re also happy to make the RocketSVN Server source code available on Google Code: 


So we're talking a boat load of free stuff here. a free SVN server, a free VS adding and free code...


The line up of third party projects used is pretty impressive...


Wednesday, January 05, 2011

4/2011 is? The end of mainstream/free support for SourceSafe… Use this as a kick-in-the-butt to move to a modern version control solution.

MSDN UK Team blog - End of support for Visual SourceSafe

“Don’t forget that mainstream support for Microsoft Visual SourceSafe ends in April 2011. After this date you’ll still be able to access extended (paid for) support, as detailed in this Microsoft Support Lifecycle blog post.

There’s also a wealth of Visual SourceSafe information at your fingertips on MSDN, and if you’d like to find out about migrating from Visual SourceSafe to Team Foundation Server, register for our LiveMeeting on 8th February.[GD: Post leached in full]

I know many of you are going to roll your eyes at this, laugh and say, “BFD, NO one uses that any more do they?” And then there’s going to be many of you, probably business/corporate/etc. dev’s, who secretly say, “Oh, I guess we better finally move off of SourceSafe…”

I know you’re out there. I know that VSS has worked well enough for you to get the job done. Well enough that you couldn’t convince Management/Business Owners/etc. to invest the time to migrate to a modern version control system.

NOW is your chance! Use the end of free VSS support as the lever, ammo, power-up, whatever to migrate off it.

You can do it. It might be painful moving to a new version control system, but if you’re still on VSS, after moving any modern system you’ll probably wonder why you waited so long. VSS has it’s day in the sun, but that day is over… It’s time to join the

You say, “but I’m still supporting VB6 code!” (sigh… Yeah, me too). So? TFS works great for VB6 code (been there, done that and loving using TFS to host my VB6 code base).

Doesn’t matter what version control system you decide on, as long as it’s “modern”. TFS, SVN, a DVCS, like GIT, doesn’t really matter. Look around, play around, but whatever one you finally pick, I think you, and Management/Business owners/etc. will happier in the end. (You’ll get real/true Branching and Merging… ZOMG… lol  ;)

Wednesday, September 30, 2009

Introduction to Subversion/SVN – What are those Trunk, Tag and Branch things?

Code.Blog - Intro to SVN: Trunk, Tags, and Branches

“Subversion (SVN) is a popular tool used by many development teams as their primary way of versioning their code.  Here are some of the basics to SVN.

Possibly one of SVN's best aspects is the ability to work on a shared code base.  This shared code base is called the Trunk.  This is typically where the full, buildable code resides.  It may depend on your team, but this code may be the code you work on daily and commit to.

This leads into the idea of commits and updates.  To illustrate this…

This is a lot of information, and is really basic when talking about SVN, but very helpful when someone asks you, "Are we going to make a Tag of the Branch before Merging into the Trunk?"  Now, go say that to everyone you meet and see if they know their SVN.”


I don’t SVN near enough (cough… like never), so I wanted to capture this for future reference.