How to Use KDIFF3 with SVN

Posted on by
Reply

KDIFF3 is a great graphical difference display utility – I use it a lot in my day job to compare the changes I have made with the changes checked in to ClearCase.

But I use Subversion for my work in my secret identity as a web developer, and although KDIFF has ClearCase integration, it didn’t have any magic buttons for SVN integration.

I found a comment in this post though, that got me most of the way there, and then with a small modification got just what I wanted:  the ability to type

diff filename.ext

and get the changes made from the last checked in copy.  Here’s what you need to do:

1. Make sure KDIFF3 is on the path (C:\Program Files\KDIFF3)

2. Add the following to a batch file in the same dir called diff.bat

@svn diff -r HEAD %1 –diff-cmd kdiff3

(Note:  That is a double dash before diff-cmd)

3. That’s it!  There is no step 3.

Now, when you are working in your working copy and want to see the changes you’ve made to a file, just type

diff filename.txt

Enjoy!

How Many Clients is Too Many for a Side Hustle?

Posted on by
Reply

A big part of getting the side hustle right is managing workload – too many clients and the stress level gets out of hand – not to mention the pace for each project slows down as you try to keep each project moving at a respectable pace.

After one week this September where I was struggling to provide designs or code for 9 clients, and prepare for a week long user interface design meeting in Boston, my wife and I are now trying to scale things back so we can have fewer active projects going at any one time.

Right now we’re down to about three active web design projects – which is still more than I think can be properly managed as a side hustle (no room remains for developing the business – writing the eBook, finishing the shopping cart) – but it’s better than attempting nine.  (For a time, it felt like Lucille Ball in the Chocolate Factory.)

With family, kids, a house and a day job, having lots of clients isn’t good – funny to say that really.  For a side hustle to be SUSTAINABLE it’s best to focus on a couple, do those well, and let other interested customers know you’ll be available next month – hard to do!