windows

Tortoise SVN

The most intuitive interface to SVN on Windows is Tortoise SVN.

It is a fantastic integration of SVN functions into the Windows Explorer. Right-click on folders and files to perform any SVN function.

The difference window is color-coded to show additions, deletions, and modifications, character-by-character.

The merge tool is also quite easy to use.

Netbeans IDE

Netbeans is a powerful IDE (integrated development environment) that supports many languages. It got its start as a Java IDE, and in fact its written in Java, so it runs on Windows, Linux, and Mac.

Netbeans is open source and free of licensing costs.

At the time of this writing, I am using Netbeans 6.8 for PHP development.

Fix corrupted SVN repository that fails svnadmin verify

Ok, this is not going to fix every corruption that you might experience, but we have a small private SVN repository running on a Windows box that recently hung during a nightly backup using hot-backup.py a Python script we found out on the net.

I immediately ran svnadmin verify C:\svnrepos and found that revision #29 would not verify. I thought this strange, since we're up to revision 2093, and we've had clean verifications up until now.

Then, I immediately ran svnadmin dump C:\svnrepos > D:\svndump-2093.dmp to backup the repository, even if it was in a corrupted state.