aediff(1) aediff(1) NNAAMMEE aediff - file differences between deltas SSYYNNOOPPSSIISS aaeeddiiffff [ _o_p_t_i_o_n... ] _f_i_l_e_n_a_m_e aaeeddiiffff --HHeellpp aaeeddiiffff --VVEERRSSiioonn DDEESSCCRRIIPPTTIIOONN The _a_e_d_i_f_f command is used to obtain the difference between versions of the given _f_i_l_e_n_a_m_e 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. EExxaammpplleess To see the difference in the project configuration file, _a_e_g_i_s_._c_o_n_f, 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. UUssiinngg GGrraapphhiiccaall TToooollss It is possible to use a graphical diff tool with the _a_e_d_i_f_f(1) com- mand. This is done by using the -command _o_p_t_i_o_n_, _o_r _s_e_t_t_i_n_g _t_h_e _A_E_2_D_I_F_F _e_n_v_i_r_o_n_m_e_n_t _v_a_r_i_a_b_l_e_. _F_o_r _e_x_a_m_p_l_e_, _t_o _u_s_e _t_h_e _t_k_d_i_f_f_(_1_) _c_o_m_- _m_a_n_d _t_o _d_i_s_p_l_a_y _t_h_e _d_i_f_f_e_r_e_n_c_e_s _y_o_u _w_o_u_l_d _u_s_e _a _c_o_m_m_a_n_d _s_u_c_h _a_s_: _a_e_d_i_f_f _-_c_o_m_m_a_n_d_=_t_k_d_i_f_f _f_i_l_e_n_a_m_e _I_f _y_o_u _u_s_e _t_h_i_s _o_p_t_i_o_n_, _m_a_n_y _o_f _t_h_e _d_i_f_f_(_1_)_-_s_p_e_c_i_f_i_c _o_p_t_i_o_n_s _w_i_l_l _b_e _i_g_n_o_r_e_d_. OOPPTTIIOONNSS The following options are understood: --BBaasseeLLiinnee This option may be used to specify that the project baseline is the subject of the command. --CChhaannggee _n_u_m_b_e_r This option may be used to specify a particular change within a project. See _a_e_g_i_s(1) for a complete description of this option. --CCOOMMmmaanndd _s_t_r_i_n_g This option may be used to set the command used to display differences. Using this option will cause _d_i_f_f(1)-specific options to be ignored. If not set, defaults to the value of the AE2DIFF environment variable, or "diff" otherwise. --CCOONNtteexxtt [ _l_i_n_e_s ] Use the context output format, showing _l_i_n_e_s (an integer) lines of context, or three if _l_i_n_e_s is not given. For proper operation, _p_a_t_c_h(1) typically needs at least two lines of con- text. --DDEELLttaa _n_u_m_b_e_r This option may be used to specify a particular delta in the project's history to copy the file from, rather than the most current version. If the delta has been given a name (see _a_e_d_n(1) for how) you may use a delta name instead of a delta number. It is an error if the delta specified does not exist. Delta numbers start from 1 and increase; delta 0 is a special case meaning "when the branch started". --DDEELLttaa__DDaattee _s_t_r_i_n_g This option may be used to specify a particular date and time in the project's history to copy the file from, rather than the most current version. It is an error if the string speci- fied cannot be interpreted as a valid date and time. Quote the string if you need to use spaces. --DDEELLttaa__FFrroomm__CChhaannggee _n_u_m_b_e_r This option may be used to specify a particular project delta from its change number. --IIggnnoorree__BBllaannkk__LLiinneess Ignore changes that just insert or delete blank lines. --IIggnnoorree__AAllll__SSppaaccee Ignore white space when comparing lines. --IIggnnoorree__CCaassee Ignore changes in case; consider upper-case and lower-case to be the same. --IIggnnoorree__SSppaaccee__CChhaannggee Ignore changes in amount of white space. --PPrroojjeecctt _n_a_m_e This option may be used to select the project of interest. When no --PPrroojjeecctt option is specified, the _A_E_G_I_S___P_R_O_J_E_C_T envi- ronment variable is consulted. If that does not exist, the user's _$_H_O_M_E_/_._a_e_g_i_s_r_c file is examined for a default project field (see _a_e_u_c_o_n_f(5) for more information). If that does not exist, when the user is only working on changes within a sin- gle project, the project name defaults to that project. Oth- erwise, it is an error. --SShhooww__CC__FFuunnccttiioonn Show which C function each change is in. --TTRRuunnkk This option may be used to specify the project trunk for the origin file, rather than the baseline. (See also --BBRRaanncchh option, the -trunk option is the same as the "-branch -" option.) --uunniiffiieedd [ _l_i_n_e_s ] Use the unified output format, showing _l_i_n_e_s (an integer) lines of context, or three if lines is not given. For proper operation, _p_a_t_c_h(1) typically needs at least two lines of con- text. --HHeellpp This option may be used to obtain more information about how to use the _a_e_d_i_f_f program. See also _a_e_g_i_s(1) for options common to all aegis commands. All options may be abbreviated; the abbreviation is documented as the upper case letters, all lower case letters and underscores (_) are optional. You must use consecutive sequences of optional letters. All options are case insensitive, you may type them in upper case or lower case or a combination of both, case is not important. For example: the arguments "-project", "-PROJ" and "-p" are all inter- preted to mean the --PPrroojjeecctt option. The argument "-prj" will not be understood, because consecutive optional characters were not supplied. Options and other command line arguments may be mixed arbitrarily on the command line, after the function selectors. The GNU long option names are understood. Since all option names for _a_e_d_i_f_f are long, this means ignoring the extra leading '-'. The "----_o_p_t_i_o_n==_v_a_l_u_e" convention is also understood. EEXXIITT SSTTAATTUUSS The _a_e_d_i_f_f command will exit with a status of 1 on any error. The _a_e_d_i_f_f command will only exit with a status of 0 if there are no errors. EENNVVIIRROONNMMEENNTT VVAARRIIAABBLLEESS See _a_e_g_i_s(1) for a list of environment variables which may affect this command. See _a_e_p_c_o_n_f(5) for the project configuration file's _p_r_o_j_e_c_t___s_p_e_c_i_f_i_c field for how to set environment variables for all commands executed by Aegis. CCOOPPYYRRIIGGHHTT aediff version 4.25.D611 Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Peter Miller The aediff program comes with ABSOLUTELY NO WARRANTY; for details use the '_a_e_d_i_f_f _-_V_E_R_S_i_o_n _L_i_c_e_n_s_e' command. This is free software and you are welcome to redistribute it under certain conditions; for details use the '_a_e_d_i_f_f _-_V_E_R_S_i_o_n _L_i_c_e_n_s_e' command. AAUUTTHHOORR Peter Miller E-Mail: pmiller@opensource.org.au /\/\* WWW: http://miller.emu.id.au/pmiller/ Reference Manual Aegis aediff(1)