Welcome to Linux Knowledge Base and Tutorial
"The place where you learn linux"
No Starch Press

 Create an AccountHome | Submit News | Your Account  

Tutorial Menu
Linux Tutorial Home
Table of Contents

· Introduction to Operating Systems
· Linux Basics
· Working with the System
· Shells and Utilities
· Editing Files
· Basic Administration
· The Operating System
· The X Windowing System
· The Computer Itself
· Networking
· System Monitoring
· Solving Problems
· Security
· Installing and Upgrading
· Linux and Windows

Glossary
MoreInfo
Man Pages
Linux Topics
Test Your Knowledge

Site Menu
Site Map
FAQ
Copyright Info
Terms of Use
Privacy Info
Disclaimer
WorkBoard
Thanks
Donations
Advertising
Masthead / Impressum
Your Account

Communication
Feedback
Forums
Private Messages
Surveys

Features
HOWTOs
News Archive
Submit News
Topics
User Articles
Web Links

Google
Google


The Web
linux-tutorial.info

Who's Online
There are currently, 191 guest(s) and 0 member(s) that are online.

You are an Anonymous user. You can register for free by clicking here

  

interdiff



SYNOPSIS

       interdiff [-p n] [-U n] [-d PAT] [-Bbiqwz] [--interpolate
                 | --combine | --flip] [--no-revert-omitted]
                 diff1 diff2

       interdiff {--help | --version}


DESCRIPTION

       interdiff creates a unified format diff that expresses the
       difference between two diffs. The diffs must both be rela­
       tive  to  the same files. For best results, the diffs must
       have at least three lines of context.

       To reverse a patch, use /dev/null for diff2.

       To reduce the amount of context in a patch, use:

              interdiff -U1 /dev/null patchfile

       Since interdiff doesn't have the advantage of  being  able
       to  look  at  the  files  that  are to be modified, it has
       stricter requirements on the input  format  than  patch(1)
       does.  The  output of GNU diff will be okay, even with ex­
       tensions, but if you intend to use a hand-edited patch  it
       might be wise to clean up the offsets and counts using re­
       countdiff(1) first.

       The diffs may be in context format. The  output,  however,
       will be in unified format.


OPTIONS

       -h     Ignored,  for  compatibility with older versions of
              interdiff. This option will go away soon.

       -p n   When comparing filenames, ignore the first n  path­
              name components from both patches. (This is similar
              to the -p option to GNU patch(1).)

       -q     Quieter output. Don't emit rationale lines  at  the
              beginning of each patch.

              terns can be given without limiting the  number  of
              pathname components.

       -i     Consider upper- and lower-case to be the same.

       -w     Ignore whitespace changes in patches.

       -b     Ignore changes in the amount of whitespace.

       -B     Ignore changes whose lines are all blank.

       -z     Decompress files with extensions .gz and .bz2.

       --interpolate
              Run as ``interdiff''. This is the default.

       --combine
              Run as ``combinediff''. See combinediff(1) for more
              information about how the behaviour is  altered  in
              this mode.

       --no-revert-omitted
              (For  interpolation  mode  only)  When  a  file  is
              changed by the first patch but not by  the  second,
              don't revert that change.

       --help Display a short usage message.

       --version
              Display the version number of interdiff.


EXAMPLES

       Basic usage:

              interdiff -z 3.2pre1.patch.gz 3.2pre2.patch.gz

       Reversing a patch:

       There  are currently no known bugs in interdiff; but there
       are some caveats. If you find  a  bug,  please  report  it
       (along with a minimal test case) to Tim Waugh <twaugh@red­
       hat.com>.

       There are some sets of patches in which there is just  not
       enough  information to produce a proper interdiff. In this
       case, the strategy employed  is  to  revert  the  original
       patch  and apply the new patch. This, unfortunately, means
       that interdiffs are not guaranteed to be reversible.


SEE ALSO

       combinediff(1)


AUTHOR

       Tim Waugh <twaugh@redhat.com>.
       Man page  edited  by  Michael  K.  Johnson  <johnsonm@red­
       hat.com>.

patchutils                 22 July 2002              INTERDIFF(1)

An undefined database error occurred. SELECT distinct pages.pagepath,pages.pageid FROM pages, page2command WHERE pages.pageid = page2command.pageid AND commandid =


  
Show your Support for the Linux Tutorial

Purchase one of the products from our new online shop. For each product you purchase, the Linux Tutorial gets a portion of the proceeds to help keep us going.


Login
Nickname

Password

Security Code
Security Code
Type Security Code


Don't have an account yet? You can create one. As a registered user you have some advantages like theme manager, comments configuration and post comments with your name.

Help if you can!


Amazon Wish List

Did You Know?
You can get all the latest Site and Linux news by checking out our news page.


Friends



Tell a Friend About Us

Bookmark and Share



Web site powered by PHP-Nuke

Is this information useful? At the very least you can help by spreading the word to your favorite newsgroups, mailing lists and forums.
All logos and trademarks in this site are property of their respective owner. The comments are property of their posters. Articles are the property of their respective owners. Unless otherwise stated in the body of the article, article content (C) 1994-2013 by James Mohr. All rights reserved. The stylized page/paper, as well as the terms "The Linux Tutorial", "The Linux Server Tutorial", "The Linux Knowledge Base and Tutorial" and "The place where you learn Linux" are service marks of James Mohr. All rights reserved.
The Linux Knowledge Base and Tutorial may contain links to sites on the Internet, which are owned and operated by third parties. The Linux Tutorial is not responsible for the content of any such third-party site. By viewing/utilizing this web site, you have agreed to our disclaimer, terms of use and privacy policy. Use of automated download software ("harvesters") such as wget, httrack, etc. causes the site to quickly exceed its bandwidth limitation and are therefore expressly prohibited. For more details on this, take a look here

PHP-Nuke Copyright © 2004 by Francisco Burzi. This is free software, and you may redistribute it under the GPL. PHP-Nuke comes with absolutely no warranty, for details, see the license.
Page Generation: 0.04 Seconds