I have everything I need on a Mac now after finally getting svnX to work, and thus justifying it’s existence (still doesn’t work with Google Code, though… must need more practice). Subversion client? Check.
All that’s left is a diffing tool that is comparable to BeyondCompare for the PC. I hit Google, and read this blog entry as well as every single comment.
Subclipse? Negative, Ghostrider.
- I do not work from my code base. SVN goes into 1 folder and my local copy into another. I then shuttle back and forth using BeyondCompare. Subclipse forces you to work in your checked out files. There are a lot of advantages to not do this.
- Diffing tool is a joke when you’ve used BeyondCompare.
Guiffy? Nope.
- I have to know Regular Expressions to exclude things? Um… no. I’m too dumb to use that feature, or is that I’m not smart enough to take advantage of it?
- I only gave it 1 hour, and got frustrated. Unfair, but I’m a user. I’ve got another month with the trial, so I’ll definately give it a ton more tries.
BBEdit? Haven’t tried it yet. I couldn’t find anything describing diff stuff in their docs, so didn’t bother. Someone know more?
FileMerge? A C guy I respect swears by it. I didn’t like it. It doesn’t (as far as I could find) support comparing file structures. This is an EXTREMLY important feature for me. The diffs do that same thing the others do where they have the strechy line things… dude, just f’ing point to the difference lineary, and I’ll fix it, you don’t need to kick it Sportacus style with the arrows for me to clearly see where the difference is.
Solution? Purchase CrossOver, use BeyondCompare. 2nd day in a row and I’m not looking back. It just works.
Comments
9 responses to “Diffing on a Mac Resolution”
I use BBEdit for this. It has a superb search and replace feature plus the compare one can compare folders and files. This together with the RegEd support and you are all set.
Just try it. It is the best so far and a great code editor as well.
Jesse,
A few steps behind you in that I have not yet gotten Subversion working.
Interested as to why you don’t work out of you checked out files ?
Many steps behind you in that version control is still foreign to me so I’m fishing for any tips on the ‘best’ way to do it. I had just assumed that when I got Subversion running I’d just use Subclipse.
Hey Jesse, SCPlugin provides TortoiseSVN like integration for Finder, really top notch.
Try Meld. It’s python based, and one of the best I’ve seen on any platform. Comparable to Araxis merge maybe.
I run it on linux but i would guess it can run on a max as well.
Its available here:
http://meld.sourceforge.net/
On your last post about this someone recommended SmartSynchronize. I got it and it seems cool. Only used it once so far.
http://www.syntevo.com/smartsynchronize/index.jsp
I used BBedit back in the day to code HTML at AIA :)
If it’s anything like SCPlugin (and it is because they both use the same subversion client under the covers), you need to check out your project at Google Code from the command line once, and then it will work fine from the graphical client. It has something to do with the security certificate.
I used to use BBEdit for diff, and its still my favorite, but now that I use Textmate, I miss it. I’ve started to use SmartCVS, which has a builtin version of SmartSynchronize, which is pretty slick.
http://www.syntevo.com/smartsynchronize/screenshots/file-compare.png
Not to throw out another option since you like what you got, but Araxis just started a Mac beta of Merge. Might we worth looking at. Merge on the PC is the bomb! I’m digging the mac version, but haven’t given it much of a run yet.