Submit Hint Search The Forums LinksStatsPollsHeadlinesRSS
14,000 hints and counting!


Click here to return to the '10.4: Check changes made to Apache's config file' hint
The following comments are owned by whoever posted them. This site is not responsible for what they say.
10.4: Check changes made to Apache's config file
Authored by: boredzo on Oct 07, '05 06:57:12AM

I find the output of diff -u easier to read.



[ Reply to This | # ]
10.4: Check changes made to Apache's config file
Authored by: gdurr on Oct 07, '05 07:08:57AM
If you have installed the Apple Developper Tools you also have filemerge which is a graphical application similar to diff.

---
--
Guillaume DURR

[ Reply to This | # ]

TextWrangler's diff
Authored by: hayne on Oct 07, '05 07:25:59AM

And there is also TextWrangler's "Find Differences..."
TextWranger also installs a command-line tool 'twdiff' that can be used instead of 'diff' - it shows the diffs in TextWranger windows.
TextWrangler is free from bbedit.com



[ Reply to This | # ]
TextWrangler's diff
Authored by: jeb on Oct 07, '05 08:57:01AM
I agree, TextWrangler is a great program, and you can't beat the price. I've tried vi and emacs, and am capable in them, but TextWrangler just makes everything so pretty and I don't have to remember nearly as many commands. You should try it out, here's a link.

[ Reply to This | # ]
unified diff
Authored by: sjk on Oct 09, '05 05:00:25PM

I'm impressed. For me, "diff -u" output has always been more machine than human readable.

The "-c" (context) option can be useful when generic diff output isn't enough. And sometimes I prefer using sdiff or wdiff.



[ Reply to This | # ]
10.4: Check changes made to Apache's config file
Authored by: bslade on Dec 28, '05 07:27:14AM
A diff command which was easier for me to read is (on OS X 10.4.3):

diff -iwy --suppress-common-lines httpd.conf httpd.conf.user_modified

Or with the diff options specified in the verbose manner:

diff --ignore-case --ignore-all-space --side-by-side --suppress-common-lines httpd.conf httpd.conf.user_modified

Note the center column. If the arrow is pointing to the left, that means a new line exists on the left, similar for a right pointing arrow.

Ben in DC

[ Reply to This | # ]