EnglishFrenchSpanish

Ad


OnWorks favicon

dirdiff - Online in the Cloud

Run dirdiff in OnWorks free hosting provider over Ubuntu Online, Fedora Online, Windows online emulator or MAC OS online emulator

This is the command dirdiff that can be run in the OnWorks free hosting provider using one of our multiple free online workstations such as Ubuntu Online, Fedora Online, Windows online emulator or MAC OS online emulator

PROGRAM:

NAME


dirdiff - display differences and merge changes between directory trees

SYNOPSIS


dirdiff [-a|--all] [-o|--only pattern] [-I|--ignore pattern] [-r|--rcs] [-t|--bktag]
[-c|--context num] [-b] [-w] [-B] [-i] [-d] [-S] [-k] dir1 dir2 ...

OPTIONS


-a,--all
Don't exclude any files.

-o,--only pattern
Only process files matching pattern.

-I,--ignore pattern
Don't process files matching pattern.

-r,--rcs
Ignore differences in RCS strings.

-t,--bktag
Ignore differences in Bitkeeper strings.

-c,--context num
Set number of lines of context to show.

-b,-w,-B,-i,-d
Pass these on to diff.

-S Show files that are the same in the file list.

-K Enable bitkeeper support.

DESCRIPTION


Dirdiff is a graphical tool for displaying the differences between directory trees (up to
5) and for merging changes from one tree into another.

At startup, dirdiff displays a main window with a list of the files that are different
between the trees. Colored squares are used to indicate the relative ages of the
versions. Files are like leaves on a deciduous tree: the newest ones are green, and then
they turn yellow, orange, and red as they get older. Missing files are black, and
directories are white.

To see the differences between two versions of a file, double-click on the file name. By
default, the first and last versions are compared, but this can be changed using the Diff
menu in the main window. In the differences window, there are checkboxes to the left of
all the sections which are different. You can use button 1 to select an individual
checkbox, or shift-button 1 or button 3 to select a whole group. Selecting a line means
that you are asking for that change to be made when you update either of the files using
the Merge menu. The line will be removed if it is already present or added if it is not
present.

To copy from one tree to another, click on the file name and select the appropriate copy
operation from the Copy menu of the main window.

Selecting Make patch from the File menu of the main window produces a file describing the
changes between the files that can be applied by the patch tool. You can edit the patch
before saving, and may wish to add explanatory text, instructions, or patch Prereq lines
at the beginning. To save the patch, enter a filename in the patch window relative to the
current directory, and choose Save. This will also close the window.

If you are sending out patches, then the from directory should be the original version of
the source. Try to make sure that the two files have the same number of leading
directories. See the patch(1) man page for more information.

NOTES


Dirdiff needs to be able to load the libfilecmp.so.0.0 shared library for the -r or -t
flags to work.

Use dirdiff online using onworks.net services


Free Servers & Workstations

Download Windows & Linux apps

  • 1
    VBA-M (Archived - Now on Github)
    VBA-M (Archived - Now on Github)
    Project has moved to
    https://github.com/visualboyadvance-m/visualboyadvance-m
    Features:Cheat creationsave statesmulti
    system, supports gba, gbc, gb, sgb,
    sgb2Tu...
    Download VBA-M (Archived - Now on Github)
  • 2
    Stacer
    Stacer
    Linux System Optimizer and Monitoring
    Github Repository:
    https://github.com/oguzhaninan/Stacer.
    Audience: End Users/Desktop. User
    interface: Qt. Programming La...
    Download Stacer
  • 3
    OrangeFox
    OrangeFox
    Fork of TeamWinRecoveryProject(TWRP)
    with many additional functions, redesign
    and more Features:Supports Treble and
    non-Treble ROMsUp-to-date Oreo kernel,
    built...
    Download OrangeFox
  • 4
    itop - ITSM  CMDB OpenSource
    itop - ITSM CMDB OpenSource
    IT Operations Portal: a complete open
    source, ITIL, web based service
    management tool including a fully
    customizable CMDB, a helpdesk system and
    a document man...
    Download itop - ITSM CMDB OpenSource
  • 5
    Clementine
    Clementine
    Clementine is a multi-platform music
    player and library organizer inspired by
    Amarok 1.4. It has a fast and
    easy-to-use interface, and allows you to
    search and ...
    Download Clementine
  • 6
    XISMuS
    XISMuS
    ATTENTION: Cumulative update 2.4.3 has
    been released!! The update works for any
    previous 2.x.x version. If upgrading
    from version v1.x.x, please download and
    i...
    Download XISMuS
  • 7
    facetracknoir
    facetracknoir
    Modular headtracking program that
    supports multiple face-trackers, filters
    and game-protocols. Among the trackers
    are the SM FaceAPI, AIC Inertial Head
    Tracker ...
    Download facetracknoir
  • More »

Linux commands

Ad