Diff Tool For Mac

I like to keep the home directories on my work (PC) and home (Mac) machines more-or-less in sync using a hard drive that I tote back and forth every few weeks. In addition to rsync, one useful tool is the unix diff command. As mentioned in, diff can not only compare two files, it can, by using the -r option, walk entire directory trees, recursively checking differences between subdirectories and files that occur at comparable points in each tree. The trick is to use the -q option to suppress line-by-line comparisons in files that differ: diff -rq dirA dirB This command will provide a nice list of files that occur in dirA but not in dirB, files that occur in dirB, but not in dirA, and files that differ between dirA and dirB. Pipe the output through grep to remove mention of uninteresting files, and sort to tidy it up, e.g.: diff -qr dirA dirB grep -v -e 'DSStore' -e 'Thumbs' sort diffs.txt This list gives me a good feel for the big picture before I start overwriting things: which files or subdirectories can be deleted, which can be synced (and in which direction) using rsync, and which should be carefully checked before replacing, in case changes need to be merged.

1. Diff Tool Mac Terminal

Our product is a visual diff tool, merge tool, and folder compare tool that makes comparing and merging sources easy and reliable. Guiffy is used around the world by thousands of professional organizations on a wide variety of platforms (Including: Windows, MacOS X, Linux, and Unix ).

To forestall some obvious comments, would seem to be the ideal tool, but it lists hundreds of files that only differ in their permissions metadata (not important to me). Although Unison appears to have an option to turn off permission checking ( -perms 0, or -perms=0), I couldn't get it to work. There are, of course, a number of GUI apps that would do the job, too (e.g., ), many of them shareware. I too am trying to keep a desktop and a laptop in sync - both running OSX. Of course the laptop has much less hd space which means I need to be selective. I have been using Unison very successfully so far for documents in general and for certain application preferences. It is very fast and a pleasure to use.

The complications come in due to the fact that applications do not always play nice with copying preferences and the like. For some apps, I haven't figured out which pref and support files are safe to copy. For example, taking a simple-minded approach to syncing causes MS Office to sort of re-install itself each time. Firefox preference copying is also not obvious to me. Is anyone else sync'ing app preferences and executables? Also, I am curious how people are using Subversion.

This hint makes me realise I'm not alone in thinking there must be simpler solution to the problem of keeping a directory in sync between work and home computers, without having to lug an external hard drive around. I need to keep a large (about 5GB) directory of pdf files in sync between a work PC and a home Mac, all sorted into appropriate sub-directories. I currently do this manually by copying any changed files onto a flash memory stick and then copying them onto the other machine when I get home.

The flash drive is not big enough to contain a copy of the entire directory, but can easily hold just the changed files. Ideally, some little program or script would identify added or changed files, copy them to the flash drive, then put them into the corresponding sub-directory when the flash drive was connected to the other machine. Then it would repeat the process in the opposite direction. Synchronization utilities are no good as they require a disk big enough to hold the entire directory. Unison is no good as it requires a network connection between the 2 machines (which most admins baulk at). Anyone have any other ideas? I too am trying to keep a desktop and a laptop in sync - both running OSX.

Of course the laptop has much less hd space which means I need to be selective. I have been using Unison very successfully so far for documents in general and for certain application preferences. It is very fast and a pleasure to use. The complications come in due to the fact that applications do not always play nice with copying preferences and the like. For some apps, I haven't figured out which pref and support files are safe to copy. For example, taking a simple-minded approach to syncing causes MS Office to sort of re-install itself each time. Firefox preference copying is also not obvious to me.

Is anyone else sync'ing app preferences and executables? Also, I am curious how people are using Subversion.

There is an in-browser Chrome extension,. Here is the description: DropboxDiff offered by Victor Shih Compare versions of your Dropbox files in-browser or with your configured diff tool. Trigger from any 'Previous versions' page. Provides two options for comparing different versions of your Dropbox files: 1) a side-by-side diff within your browser, or 2) an external diff tool.

Diff Tool Mac Terminal

This can be TortoiseMerge, kdiff3, FileMerge, or any tool which can be triggered from a command line. In the 'Previous versions' view of the Dropbox web interface of any file, a column is added which allows you to select two versions to compare. Click the Inline button to view the difference in-browser, or the Diff button to trigger your configured diff tool. Supports Windows, Mac, and Linux as far as I know, though I can't be sure every possible configuration is covered.