by Sandra Henry-Stocker
Open Source

Linux command: Side by side diff

November 26, 2008, 12:46 PM — 

Every now and then I come across a feature of some Linux command that works so well that I have trouble understanding how I managed without it for so long. The one that I most recently discovered is the side by side option for the diff command.

Sure, the designations that diff offers to identify differences between two files are useful. But I don't find them particularly intuitive.


# diff frogs frogs2
7,8c7,8
< Canyon Treefrog
< (Hyla arenicolor)
---
> Florida Cricket Frog
> (Acris gryllus dorsalis)
28,30d27
< Western Chorus Frog
< (Pseudacris triseriata triseriata)
<
33a31,33
> Southern Chorus Frog
> (Pseudacris nigrita nigrita)
>
35a36,38
>
> Little Grass Frog
> (Pseudacris ocularis)

The standard diff output is meant to be terse. It captures the differences between two files in such a way as to make it possible to convert one file to the other if you only end up with one of them. The "7,8c7,8" string, for example, captures the fact that lines 7 and 8 are different between the two files. If you want to turn frogs into frogs2, you exchange the following two lines with two following the "---". To turn frogs2 into frogs, you do the reverse. One way to keep many generations of an important file without duplicating most of the content over and over again would to be to save the diffs.

If you are only interested in whether the files are different, you can throw away the output from the diff command (i.e., send it to /dev/null) and look at $? (the return code). If the files are different, $? will be set to 1. Alternately, you could use the simpler cmp command which reports the first difference between the two files and then stops.

The side by side equivalent of this output is more wordy, but I instantly understand the nature and extent of the differences. The vertical bar ("|") characters point out differences between the two files while the "<" and ">" characters note where content appears in only one or the other of the two files.


# diff -y -W 80 frogs frogs2
Blanchard's Cricket FrogBlanchard's Cricket Frog
(Acris crepitans blanchardi)(Acris crepitans blanchardi)

Southern Cricket FrogSouthern Cricket Frog
(Acris gryllus gryllus)(Acris gryllus gryllus)

Canyon Treefrog| Florida Cricket Frog
(Hyla arenicolor)| (Acris gryllus dorsalis)

Squirrel Tree FrogSquirrel Tree Frog
(Hyla squirella)(Hyla squirella)

Green TreefrogGreen Treefrog
(Hyla cinerea)(Hyla cinerea)

Birdvoiced TreefrogBirdvoiced Treefrog
(Hyla avivoca)(Hyla avivoca)

Gray TreefrogGray Treefrog
(Hyla versicolor - Hyla chrysocelis)(Hyla versicolor - Hyla chrysocelis)

Pine Woods TreefrogPine Woods Treefrog
(Hyla femoralis)(Hyla femoralis)

Northern Spring Peeper Northern Spring Peeper
(Pseudacris crucifer crucifer) (Pseudacris crucifer crucifer)

Western Chorus Frog <
(Pseudacris triseriata triseriata) <
<
Upland Chorus FrogUpland Chorus Frog
(Pseudacris triseriata feriarum)(Pseudacris triseriata feriarum)

> Southern Chorus Frog
> (Pseudacris nigrita nigrita)
>
Ornate Chorus FrogOrnate Chorus Frog
(Pseudacris ornata)(Pseudacris ornata)
>
> Little Grass Frog
> (Pseudacris ocularis)

Cuban TreefrogCuban Treefrog
(Osteopilus septentrionalis)(Osteopilus septentrionalis)

A diff command with the side by side feature can be added to Solaris systems via the diffutils package (diffutils-2.8.1-sol10-sparc-local.gz). When you want a human-friendly listing of file differences that doesn't give you anything you will need to decode, this is the command to use.

I like it!
Comments

Solaris has always (?) had sdiff

It is not really necessary to add diffutils to Solaris for side-by-side diff comparisons. It may be useful for consistency in scripts, but side-by-side diff is more of a human interface and not really a scripting tool.

I have been using Solaris (on SPARC) for about 13 years (and SunOS before that). It has always had sdiff. I can't remember if it was in SunOS since that was a while ago.

As I recall, sdiff was used under the graphical interface for WorkShop (the compiler tools).

Gerard
| reply

tkdiff

As always I enjoyed your article Sandra. Just wanted to add I've come to really like using tkdiff, a very nice graphical wrapper around diff that is very portable. I found it here http://sourceforge.net/projects/tkdiff .
| reply

Mac OS X Users

Great article Sandra, as always. For Mac OS X users can use opendiff command. it opens files in graphical environment and points out the differences.
| reply
Free books

Essential JavaFX
Get started building rich Web apps quickly with an introduction to the power of JavaFX key features -- scene node graphs, nodes as components, the coordinate system, layout options, colors and gradients, custom classes with inheritance, animation, binding, and event handlers.Enter now!

The Nomadic Developer
Consulting can be hugely rewarding, but it's easy to fail if you are unprepared. To succeed, you need a mentor who knows the lay of the land. Aaron Erickson is your mentor, and this is your guidebook. Enter now!

Featured Sponsor

AISO founders envisioned a Web hosting company that was environmentally friendly. While the company employed energy-efficient innovations like solar panels, its infrastructure produced unacceptable power and cooling requirements. Find out how AISO leveraged AMD technology to overcome their challenge in this case study white paper.

In this whitepaper, Scalar explores the opportunity to change the landscape with respect to mission critical databases built around Oracle. Leveraging technologies such as Linux, high-end commodity processing power and Oracle RAC technology to architect, design, build and maintain database infrastructure that delivers maximum availability, reliability and performance at a fraction of traditional cost.

On a typical day, weather.com, the Web site for The Weather Channel in Atlanta, serves up between 15 million and 20 million page views. But in September 2004, when back-to-back hurricanes ransacked Florida, the peak traffic on one day more than tripled: over 70 million page views by more than 7 million unique visitors. Read the full success story now.

Marketplace