table of contents
other versions
- jessie 4.24.3-3
aediff(1) | aediff(1) |
NAME¶
aediff - file differences between deltasSYNOPSIS¶
aediff [ option... ] filenameDESCRIPTION¶
The aediff command is used to obtain the difference between versions of the given filename across different file versions, a specified by the command lien options. If two changes or deltas are specified, the difference between the versions of the file in each will be output. If only one change or delta is specified, the second version defaults to the current change. If no changes or deltas are specified, the first version defaults to the baseline and the second version defaults to the current change.Examples¶
To see the difference in the project configuration file, aegis.conf, between deltas 1.2.D003 and 4.5.D067 the following command may be used:aediff aegis.conf -c 1.2.D003 -c 4.5.D067
To see the differences in the project configuration file, between the head of
the 7.6 branch and the current change, the following command may be used:
aediff -branch 7.6 -bl aegis.conf
Many, many other combinatiosn are possible.
Using Graphical Tools¶
It is possible to use a graphical diff tool with the aediff(1) command. This is done by using the -command option, or setting the AE2DIFF environment variable. For example, to use the tkdiff (1) command to display the differences you would use a command such as:aediff --command=tkdiff filename
If you use this option, many of the diff(1)-specific options will be
ignored.
OPTIONS¶
The following options are understood:- -BaseLine
- This option may be used to specify that the project baseline is the subject of the command.
- -Change number
- This option may be used to specify a particular change within a project. See aegis(1) for a complete description of this option.
- -COMmand string
- This option may be used to set the command used to display differences. Using this option will cause diff(1)-specific options to be ignored. If not set, defaults to the value of the AE2DIFF environment variable, or "diff" otherwise.
- -CONtext [ lines ]
- Use the context output format, showing lines (an integer) lines of context, or three if lines is not given. For proper operation, patch(1) typically needs at least two lines of context.
- -DELta number
-
- -DELta_Date string
-
- -DELta_From_Change number
-
- -Ignore_Blank_Lines
- Ignore changes that just insert or delete blank lines.
- -Ignore_All_Space
- Ignore white space when comparing lines.
- -Ignore_Case
- Ignore changes in case; consider upper- and lower-case to be the same.
- -Ignore_Space_Change
- Ignore changes in amount of white space.
- -Project name
- This option may be used to select the project of interest. When no -Project option is specified, the AEGIS_PROJECT environment variable is consulted. If that does not exist, the user's $HOME/.aegisrc file is examined for a default project field (see aeuconf(5) for more information). If that does not exist, when the user is only working on changes within a single project, the project name defaults to that project. Otherwise, it is an error.
- -Show_C_Function
- Show which C function each change is in.
- -TRunk
-
- -unified [ lines ]
- Use the unified output format, showing lines (an integer) lines of context, or three if lines is not given. For proper operation, patch(1) typically needs at least two lines of context.
- -Help
-
EXIT STATUS¶
The aediff command will exit with a status of 1 on any error. The aediff command will only exit with a status of 0 if there are no errors.ENVIRONMENT VARIABLES¶
See aegis(1) for a list of environment variables which may affect this command. See aepconf(5) for the project configuration file's project_specific field for how to set environment variables for all commands executed by Aegis.COPYRIGHT¶
aediff version 4.24.3.D001AUTHOR¶
Peter Miller | E-Mail: | millerp@canb.auug.org.au |
/\/\* | WWW: | http://www.canb.auug.org.au/~millerp/ |
Aegis | Reference Manual |