'\" t
.\"	aegis - project change supervisor
.\"	Copyright (C) 1991-1996, 1998, 1999, 2002, 2004-2008 Peter Miller
.\"
.\"	This program is free software; you can redistribute it and/or modify
.\"	it under the terms of the GNU General Public License as published by
.\"	the Free Software Foundation; either version 3 of the License, or
.\"	(at your option) any later version.
.\"
.\"	This program is distributed in the hope that it will be useful,
.\"	but WITHOUT ANY WARRANTY; without even the implied warranty of
.\"	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
.\"	GNU General Public License for more details.
.\"
.\"	You should have received a copy of the GNU General Public License
.\"	along with this program. If not, see
.\"	<http://www.gnu.org/licenses/>.
.\"
.\"
.\"	aegis - project change supervisor
.\"	Copyright (C) 1991-1993, 1997, 2006-2008 Peter Miller
.\"
.\"	This program is free software; you can redistribute it and/or modify
.\"	it under the terms of the GNU General Public License as published by
.\"	the Free Software Foundation; either version 3 of the License, or
.\"	(at your option) any later version.
.\"
.\"	This program is distributed in the hope that it will be useful,
.\"	but WITHOUT ANY WARRANTY; without even the implied warranty of
.\"	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
.\"	GNU General Public License for more details.
.\"
.\"	You should have received a copy of the GNU General Public License
.\"	along with this program. If not, see
.\"	<http://www.gnu.org/licenses/>.
.\"
.ds n) aegis
.ds N) Aegis
.if n .nr )M 8n
.if n .nr IN 8n
.if n .nr )I 8n
.if n .po 0
.hy 0
.if n .ad l
.de r)
.if !'\\*(R)'no' \{\
.PP
See also
.IR \*(n) (1)
for options common to all \*(n) commands.
.\}
..
.de eB
.RS
.nf
.ft CW
.ta 8n 16n 24n 32n
..
.de eE
.ft P
.fi
.RE
..
.TH "\*(n) -DIFFerence" 1 \*(N) "Reference Manual"
.SH NAME
aegis difference \- find differences between a change and the baseline
.XX "aed(1)" "difference a change"
.SH SYNOPSIS
.B \*(n)
.B -DIFFerence
[
.IR filename ...
]
[
.IR option ...
]
.br
.B \*(n)
.B -DIFFerence
.B -List
[
.IR option ...
]
.br
.B \*(n)
.B -DIFFerence
.B -Help
.SH DESCRIPTION
The
.I \*(n)
.I -DIFFerence
command is used to
generate difference listings between source files in the
the development directory and the baseline.
The purpose is to enable reviewers to find each and every edit
performed on the source files.
The difference listings will be placed into files
named for the sources files but
with an additional "\f(CW,D\fP" suffix.
.PP
The command used to perform the differences is specified in the
.I diff_command
field of the project
configuration
file (see
.IR aepconf (5)
for more information).
.PP
It is possible to configure a project to omit the diff step as
unnecessary, by the following setting:
.RS
diff_command = "exit 0";
.RE
This disables all generation, checking and validation of difference file
for each change source file.  The merge functions of the \fIaediff\fP(1)
command are unaffected by this setting.
.PP
Please note that the \fIhistory_\%content_\%limitation\fP field
of the project configuration file does \fBnot\fP apply to the
\fIdiff_\%command\fP field.
.PP
If no files are named on the command line,
all files in the change will be differenced.
.PP
You may name a directory on the command line,
and all files in the change in that directory tree will be differenced.
.\"
.\"	aegis - project change supervisor
.\"	Copyright (C) 1991-1993, 1999, 2002, 2006-2008 Peter Miller
.\"
.\"	This program is free software; you can redistribute it and/or modify
.\"	it under the terms of the GNU General Public License as published by
.\"	the Free Software Foundation; either version 3 of the License, or
.\"	(at your option) any later version.
.\"
.\"	This program is distributed in the hope that it will be useful,
.\"	but WITHOUT ANY WARRANTY; without even the implied warranty of
.\"	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
.\"	GNU General Public License for more details.
.\"
.\"	You should have received a copy of the GNU General Public License
.\"	along with this program. If not, see
.\"	<http://www.gnu.org/licenses/>.
.\"
.SS File Name Interpretation
The \*(n) program will attempt to determine the project file names
from the file names given on the command line.
All file names are stored within \*(n) projects as relative to
the root of the baseline directory tree.
The development directory and the integration directory are shadows of
this baseline directory, and so these relative names apply here, too.
Files named on the command line
are first converted to absolute paths if necessary.
They are then compared with the baseline path,
the development directory path,
and the integration directory path,
to determine a baseline-relative name.
It is an error if the file named is outside
one of these directory trees.
.PP
The \fB-BAse_RElative\fP option may be used to cause relative filenames
to be interpreted as relative to the baseline path; absolute filenames
will still be compared with the various paths in order to determine a
baseline-relative name.
.PP
The \fIrelative_filename_preference\fP in the user configuration file
may be used to modify this default behavior.  See \fIaeuconf\fP(5) for
more information.
.SS Notification
The actions of the command are controlled by the \fIdiff_\%command\fP
and \fImerge_\%command\fP fields of the project \fIconfig\fP
file.  See \fIaepconf\fP(5) for more information.
.\"
.\"	aegis - project change supervisor
.\"	Copyright (C) 1996, 1998, 1999, 2002, 2006-2008 Peter Miller
.\"
.\"	This program is free software; you can redistribute it and/or modify
.\"	it under the terms of the GNU General Public License as published by
.\"	the Free Software Foundation; either version 3 of the License, or
.\"	(at your option) any later version.
.\"
.\"	This program is distributed in the hope that it will be useful,
.\"	but WITHOUT ANY WARRANTY; without even the implied warranty of
.\"	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
.\"	GNU General Public License for more details.
.\"
.\"	You should have received a copy of the GNU General Public License
.\"	along with this program. If not, see
.\"	<http://www.gnu.org/licenses/>.
.\"
.SH THE BASELINE LOCK
The baseline lock is used to ensure that the baseline remains in a
consistent state for the duration of commands which need to read the
contents of files in the baseline.
.PP
The commands which require the baseline to be consistent
(these include the
.IR aeb (1),
.IR aecp (1)
and
.IR aed (1)
commands)
take a baseline
.I read
lock.
This is a non-exclusive lock,
so the concurrent development of changes is not hindered.
.PP
The command which modifies the baseline,
.IR aeipass (1),
takes a baseline
.I write
lock.
This is an exclusive lock,
forcing
.IR aeipass (1)
to block until there are no active baseline read locks.
.PP
It is possible that
one of the above development commands
will block until an in-progress
.I "\*(n) -Integrate_PASS"
completes.
This is usually of short duration while the project history is updated.
The delay is essential so that these commands receive a consistent view
of the baseline.
No other integration command will cause the above development commands
to block.
.PP
When \*(n)' branch functionality is in use,
a read (non-exclusive) lock is taken on the branch baseline and also
each of the "parent" baselines.
However,
a baseline write (exclusive) lock is only taken on the branch baseline;
the "parent" baselines are only read (non-exclusive) locked.
.\"
.\"	aegis - project change supervisor
.\"	Copyright (C) 2005-2008 Peter Miller
.\"
.\"	This program is free software; you can redistribute it and/or modify
.\"	it under the terms of the GNU General Public License as published by
.\"	the Free Software Foundation; either version 3 of the License, or
.\"	(at your option) any later version.
.\"
.\"	This program is distributed in the hope that it will be useful,
.\"	but WITHOUT ANY WARRANTY; without even the implied warranty of
.\"	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
.\"	GNU General Public License for more details.
.\"
.\"	You should have received a copy of the GNU General Public License
.\"	along with this program. If not, see
.\"	<http://www.gnu.org/licenses/>.
.\"
.SS File Action Adjustment
When this command runs, it first checks the change files against the
projects files.  If there are inconsistencies, the file actions will be
adjusted as follows:
.TP 8n
create
If a file is being created, but another change set is integrated which
also creates the file, the file action in the change set still being
developed will be adjusted to "modify".
.TP 8n
modify
If a file is being modified, but another change set is integrated
which removes the file, the file action in the change set still being
developed will be adjusted to "create".
.TP 8n
remove
If a file is being removed, but another change set is integrated which
removes the file, the file will be dropped from the change set still
being developed.
.SH CONFLICT RESOLUTION
If the version of a file in the change is not the same
as the version of the file in the baseline,
it is out-of-date;
some other change has altered the file while this change was
being developed.
.PP
When a difference is requested for an out-of-date file,
a merge is performed
between the common ancestor,
the version in the baseline,
and the version in the development directory.
The command used to perform the merge is specified by the
.I merge_command
field of the project
configuration
file (see
.IR aepconf (5)
for more information).
.PP
Please note that the \fIhistory_\%content_\%limitation\fP field
of the project configuration file does \fBnot\fP apply to the
\fImerge\%_command\fP field.
.PP
After the merge is performed
the version of the file will be changed to be the current version,
marking the file as up to date,
and a new build will be required.
.PP
The original file in your development directory is preserved with an
"\f[CW],B\fP" suffix (B for backup).  The source file contains the
result of the merge.  You should edit the source files, to make sure the
automatic merge has produced sensible results.
.PP
This merge process works most of the time.
Usually two changes to two logically separate areas of functionality
will alter two logically separate parts of any files they may
have in common.
There are pathological cases where this merge process is spectacularly
useless,
but these are surprisingly rare in practice.
.PP
If you don't want the automatic merge results, simply use the
\fImv\fP(1) command to restore the contents from the "\f[CW],B\fP" file.
.PP
If any merges are required no differences will be performed.
An error message and a non-zero exit status will also result.
This is to ensure that developers notice that merges have been done,
and that they reconcile the sources and the merged \fI,D\fP files
before the next difference.
See the
.B -No_Merge
and
.B -Only_Merge
options, below,
for exact control of when merging is performed.
.\"
.\"	aegis - project change supervisor
.\"	Copyright (C) 2005-2008 Peter Miller
.\"
.\"	This program is free software; you can redistribute it and/or modify
.\"	it under the terms of the GNU General Public License as published by
.\"	the Free Software Foundation; either version 3 of the License, or
.\"	(at your option) any later version.
.\"
.\"	This program is distributed in the hope that it will be useful,
.\"	but WITHOUT ANY WARRANTY; without even the implied warranty of
.\"	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
.\"	GNU General Public License for more details.
.\"
.\"	You should have received a copy of the GNU General Public License
.\"	along with this program. If not, see
.\"	<http://www.gnu.org/licenses/>.
.\"
.SH Cloning and Merging
When you use \fIaeclone\fP(1) to clone a change set, and then integrate
one of the two change sets, you will observe that Aegis says that the
files of the un-integrated change are now out-of-date.
.PP
If you run \fIaem\fP(1) to bring the out-of-date files back up-to-date,
\fIfmerge\fP(1) and some (but not) all other merging tools, it signals
just about everything as a conflict, even though both alternatives are
identical.
.LP
The problem is that two changes making identical edits to the same place
in the same file are a logical conflict, even if not an actual conflict,
and it takes a human to figure out the difference.  Think of a shopping
list: the ensuite needs more soap, and so does the main bathroom.  The
second "soap" on the merge of the two shopping lists isn't a duplicate,
you really do need two boxes of soap.  Sometimes edits of source files
are the same: sometimes the logical conflict is resolved by applying
both identical edits, not just one.
.LP
This is just the \fIfmerge\fP(1) command being more conservative than
RCS's \fImerge\fP(1) command.
.LP
The easiest way to deal with this common situation it to run an
.RS
.ft CW
aecpu -unchanged
.ft P
.RE
command \fIbefore\fP you run the \fIaem\fP(1) merge command, and you
will have less grief.  It's also worth remembering that Aegis stashes
the original file with a \f[CW],B\fP suffix (B for backup) so you can
simply
.RS
.ft CW
mv \fIfubar\fP,B \fIfubar\fP
.ft R
.RE
if you know that all of the conflicts are logical conflicts.
.SH INTEGRATION
During integration, it is also necessary to difference a change.
This provides the difference between the branch and its parent, for
when development on a branch is completed and it is to be reviewed.
The baseline of a branch is the development directory of the composite
change it represents.
.SH OPTIONS
The following options are understood:
.\"
.\"	aegis - project change supervisor
.\"	Copyright (C) 1991-1993, 2002, 2006-2008 Peter Miller.
.\"
.\"	This program is free software; you can redistribute it and/or modify
.\"	it under the terms of the GNU General Public License as published by
.\"	the Free Software Foundation; either version 3 of the License, or
.\"	(at your option) any later version.
.\"
.\"	This program is distributed in the hope that it will be useful,
.\"	but WITHOUT ANY WARRANTY; without even the implied warranty of
.\"	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
.\"	GNU General Public License for more details.
.\"
.\"	You should have received a copy of the GNU General Public License
.\"	along with this program. If not, see
.\"	<http://www.gnu.org/licenses/>.
.\"
.TP 8n
\fB-ANticipate\fP \fIchange-number\fP
.br
This option is used to nominate a source for the reference files,
rather than the baseline.
This may be used to synchronize with a change without
having to wait for it to arrive in the baseline.
It is an error if the anticipated change is not in one of the
.I "'being reviewed'"
or
.I "'awaiting integration'"
or
.I "'being integrated'"
states.
A merge is always performed,
because the anticipated change is "about" to make
any common file out-of-date.
You will still have to perform a "real" merge later.
.\"
.\"	aegis - project change supervisor
.\"	Copyright (C) 1996, 1999, 2002, 2005-2008 Peter Miller
.\"
.\"	This program is free software; you can redistribute it and/or modify
.\"	it under the terms of the GNU General Public License as published by
.\"	the Free Software Foundation; either version 3 of the License, or
.\"	(at your option) any later version.
.\"
.\"	This program is distributed in the hope that it will be useful,
.\"	but WITHOUT ANY WARRANTY; without even the implied warranty of
.\"	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
.\"	GNU General Public License for more details.
.\"
.\"	You should have received a copy of the GNU General Public License
.\"	along with this program. If not, see
.\"	<http://www.gnu.org/licenses/>.
.\"
.TP 8n
\fB-BRanch\fP \fInumber\fP
This option may be used to specify a
different branch for the origin file,
rather than the baseline.
(See also \fB\-TRunk\fP option.\)
Please Note: the \fB-BRanch\fP option does not take a project name,
just the branch number suffix.
.TP 8n
\fB\-GrandParent\fP
This option may be used to specify the grandparent branch (one up from
the current branch) for the origin file, rather than the baseline.
(The \-grandparent option is the same as the \[lq]\-branch ..\[rq] option.)
.\"
.\"	aegis - project change supervisor
.\"	Copyright (C) 1991-1993, 2003, 2006-2008 Peter Miller.
.\"
.\"	This program is free software; you can redistribute it and/or modify
.\"	it under the terms of the GNU General Public License as published by
.\"	the Free Software Foundation; either version 3 of the License, or
.\"	(at your option) any later version.
.\"
.\"	This program is distributed in the hope that it will be useful,
.\"	but WITHOUT ANY WARRANTY; without even the implied warranty of
.\"	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
.\"	GNU General Public License for more details.
.\"
.\"	You should have received a copy of the GNU General Public License
.\"	along with this program. If not, see
.\"	<http://www.gnu.org/licenses/>.
.\"
.TP 8n
\fB-Change\fP \fInumber\fP
This option may be used to specify a particular change within a project.
See \fIaegis\fP(1) for a complete description of this option.
.\"
.\"	aegis - project change supervisor
.\"	Copyright (C) 1991-1993, 2006-2008 Peter Miller.
.\"
.\"	This program is free software; you can redistribute it and/or modify
.\"	it under the terms of the GNU General Public License as published by
.\"	the Free Software Foundation; either version 3 of the License, or
.\"	(at your option) any later version.
.\"
.\"	This program is distributed in the hope that it will be useful,
.\"	but WITHOUT ANY WARRANTY; without even the implied warranty of
.\"	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
.\"	GNU General Public License for more details.
.\"
.\"	You should have received a copy of the GNU General Public License
.\"	along with this program. If not, see
.\"	<http://www.gnu.org/licenses/>.
.\"
.TP 8n
.B -Help
.br
This option may be used to obtain more information about how to use the
.I \*(n)
program.
.\"
.\"	aegis - project change supervisor
.\"	Copyright (C) 1991-1993, 2006-2008 Peter Miller.
.\"
.\"	This program is free software; you can redistribute it and/or modify
.\"	it under the terms of the GNU General Public License as published by
.\"	the Free Software Foundation; either version 3 of the License, or
.\"	(at your option) any later version.
.\"
.\"	This program is distributed in the hope that it will be useful,
.\"	but WITHOUT ANY WARRANTY; without even the implied warranty of
.\"	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
.\"	GNU General Public License for more details.
.\"
.\"	You should have received a copy of the GNU General Public License
.\"	along with this program. If not, see
.\"	<http://www.gnu.org/licenses/>.
.\"
.TP 8n
.B -List
.br
This option may be used to obtain a list of suitable subjects for this
command.
The list may be more general than expected.
.\"
.\"	aegis - project change supervisor
.\"	Copyright (C) 1992, 1993, 2006-2008 Peter Miller.
.\"
.\"	This program is free software; you can redistribute it and/or modify
.\"	it under the terms of the GNU General Public License as published by
.\"	the Free Software Foundation; either version 3 of the License, or
.\"	(at your option) any later version.
.\"
.\"	This program is distributed in the hope that it will be useful,
.\"	but WITHOUT ANY WARRANTY; without even the implied warranty of
.\"	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
.\"	GNU General Public License for more details.
.\"
.\"	You should have received a copy of the GNU General Public License
.\"	along with this program. If not, see
.\"	<http://www.gnu.org/licenses/>.
.\"
.TP 8n
.B -Not_Logging
.br
This option may be used to disable the automatic logging of
output and errors to a file.
This is often useful when several \*(n) commands are combined
in a shell script.
.\"
.\"	aegis - project change supervisor
.\"	Copyright (C) 1996, 1999, 2002, 2005-2008 Peter Miller
.\"
.\"	This program is free software; you can redistribute it and/or modify
.\"	it under the terms of the GNU General Public License as published by
.\"	the Free Software Foundation; either version 3 of the License, or
.\"	(at your option) any later version.
.\"
.\"	This program is distributed in the hope that it will be useful,
.\"	but WITHOUT ANY WARRANTY; without even the implied warranty of
.\"	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
.\"	GNU General Public License for more details.
.\"
.\"	You should have received a copy of the GNU General Public License
.\"	along with this program. If not, see
.\"	<http://www.gnu.org/licenses/>.
.\"
.TP 8n
.B -TRunk
.br
This option may be used to specify
the project trunk for the origin file,
rather than the baseline.
(See also \fB\-BRanch\fP option,
the -trunk option is the same as the \[lq]\-branch \-\[rq] option.)
.TP 8n
.B -No_Merge
.br
This option is used to
cause only file differences to be generated,
even when file versions are out-of-date.
If not set, the default is to use the
.I diff_preference
field of the
.IR aeuconf (5)
file.
.TP 8n
.B -Only_Merge
.br
This option is used to
cause only file merges to be performed
on files with out-of-date versions.
Other source files are ignored.
If not set, the default is to use the
.I diff_preference
field of the
.IR aeuconf (5)
file.
.TP 8n
.B -Automatic_Merge
.br
This option is used to
perform
.I -Only_Merge
if any source files have out-of-date versions,
otherwise
.I -No_Merge is performed.
Only merges or differences will be performed,
it will never use a mixture.
If not set, the default is to use the
.I diff_preference
field of the
.IR aeuconf (5)
file.
.\"
.\"	aegis - project change supervisor
.\"	Copyright (C) 1991-1993, 2006-2008 Peter Miller.
.\"
.\"	This program is free software; you can redistribute it and/or modify
.\"	it under the terms of the GNU General Public License as published by
.\"	the Free Software Foundation; either version 3 of the License, or
.\"	(at your option) any later version.
.\"
.\"	This program is distributed in the hope that it will be useful,
.\"	but WITHOUT ANY WARRANTY; without even the implied warranty of
.\"	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
.\"	GNU General Public License for more details.
.\"
.\"	You should have received a copy of the GNU General Public License
.\"	along with this program. If not, see
.\"	<http://www.gnu.org/licenses/>.
.\"
.TP 8n
\fB-Project\fP \fIname\fP
This option may be used to select the project of interest.
When no
.B -Project
option is specified,
the
.I AEGIS_PROJECT
environment variable is consulted.
If that does not exist,
the user's
.I $HOME/.aegisrc
file is examined for a default project field (see
.IR 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.
.\"
.\"	aegis - project change supervisor
.\"	Copyright (C) 1991-1993, 2002, 2006-2008 Peter Miller.
.\"
.\"	This program is free software; you can redistribute it and/or modify
.\"	it under the terms of the GNU General Public License as published by
.\"	the Free Software Foundation; either version 3 of the License, or
.\"	(at your option) any later version.
.\"
.\"	This program is distributed in the hope that it will be useful,
.\"	but WITHOUT ANY WARRANTY; without even the implied warranty of
.\"	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
.\"	GNU General Public License for more details.
.\"
.\"	You should have received a copy of the GNU General Public License
.\"	along with this program. If not, see
.\"	<http://www.gnu.org/licenses/>.
.\"
.TP 8n
.B -TERse
.br
This option may be used to cause listings to
produce the bare minimum of information.
It is usually useful for shell scripts.
.\"
.\"	aegis - project change supervisor
.\"	Copyright (C) 1991-1993, 2002, 2006-2008 Peter Miller.
.\"
.\"	This program is free software; you can redistribute it and/or modify
.\"	it under the terms of the GNU General Public License as published by
.\"	the Free Software Foundation; either version 3 of the License, or
.\"	(at your option) any later version.
.\"
.\"	This program is distributed in the hope that it will be useful,
.\"	but WITHOUT ANY WARRANTY; without even the implied warranty of
.\"	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
.\"	GNU General Public License for more details.
.\"
.\"	You should have received a copy of the GNU General Public License
.\"	along with this program. If not, see
.\"	<http://www.gnu.org/licenses/>.
.\"
.TP 8n
.B -Verbose
This option may be used to cause \*(n) to produce more output.
By default \*(n) only produces output on errors.
When used with the
.B -List
option
this option causes column headings to be added.
.\"
.\"	aegis - project change supervisor
.\"	Copyright (C) 1998, 2006-2008 Peter Miller
.\"
.\"	This program is free software; you can redistribute it and/or modify
.\"	it under the terms of the GNU General Public License as published by
.\"	the Free Software Foundation; either version 3 of the License, or
.\"	(at your option) any later version.
.\"
.\"	This program is distributed in the hope that it will be useful,
.\"	but WITHOUT ANY WARRANTY; without even the implied warranty of
.\"	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
.\"	GNU General Public License for more details.
.\"
.\"	You should have received a copy of the GNU General Public License
.\"	along with this program. If not, see
.\"	<http://www.gnu.org/licenses/>.
.\"
.TP 8n
.B \-Wait
This option may be used to require \*(N) commands to wait for access
locks, if they cannot be obtained immediately.
Defaults to the user's
.I lock_wait_preference
if not specified, see
.IR aeuconf (5)
for more information.
.TP 8n
.B \-No_Wait
This option may be used to require \*(N) commands to emit a fatal error
if access locks cannot be obtained immediately.
Defaults to the user's
.I lock_wait_preference
if not specified, see
.IR aeuconf (5)
for more information.
.\"
.\"	aegis - project change supervisor
.\"	Copyright (C) 1991-1993, 2006-2008 Peter Miller.
.\"
.\"	This program is free software; you can redistribute it and/or modify
.\"	it under the terms of the GNU General Public License as published by
.\"	the Free Software Foundation; either version 3 of the License, or
.\"	(at your option) any later version.
.\"
.\"	This program is distributed in the hope that it will be useful,
.\"	but WITHOUT ANY WARRANTY; without even the implied warranty of
.\"	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
.\"	GNU General Public License for more details.
.\"
.\"	You should have received a copy of the GNU General Public License
.\"	along with this program. If not, see
.\"	<http://www.gnu.org/licenses/>.
.\"
.r)
.PP
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.
.PP
All options are case insensitive,
you may type them in upper case or lower case or a combination of both,
case is not important.
.PP
For example:
the arguments "-project, "-PROJ" and "-p" are
all interpreted to mean the \fB-Project\fP option.
The argument "-prj" will not be understood,
because consecutive optional characters were not supplied.
.PP
Options and other command line arguments may be
mixed arbitrarily on the command line,
after the function selectors.
.br
.ne 4
.PP
The GNU long option names are understood.
Since all option names for
.I \*(n)
are long,
this means ignoring the extra leading '-'.
The "\fB--\fIoption\fB=\fIvalue\fR" convention is also understood.
.SH RECOMMENDED ALIAS
The recommended alias for this command is
.nf
.ta 8n 16n
csh%	alias aed '\*(n) -diff \e!* -v'
sh$	aed(){\*(n) -diff "$@" -v}
.fi
For user's convenience,
particularly when they have selected the \[lq]no merge\[rq] preference,
there is also a merge alias:
.nf
.ta 8n 16n
csh%	alias aem '\*(n) -diff -only_merge \e!* -v'
sh$	aem(){\*(n) -diff -only_merge $* -v}
.fi
.SH ERRORS
It is an error if
the change is not in the
.I "being developed"
or
.I "being integrated"
states.
.br
.\"
.\"	aegis - project change supervisor
.\"	Copyright (C) 1991-1993, 1995, 1997, 2004, 2006-2008 Peter Miller
.\"
.\"	This program is free software; you can redistribute it and/or modify
.\"	it under the terms of the GNU General Public License as published by
.\"	the Free Software Foundation; either version 3 of the License, or
.\"	(at your option) any later version.
.\"
.\"	This program is distributed in the hope that it will be useful,
.\"	but WITHOUT ANY WARRANTY; without even the implied warranty of
.\"	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
.\"	GNU General Public License for more details.
.\"
.\"	You should have received a copy of the GNU General Public License
.\"	along with this program. If not, see
.\"	<http://www.gnu.org/licenses/>.
.\"
.SH EXIT STATUS
The
.I \*(n)
command will exit with a status of 1 on any error.
The
.I \*(n)
command will only exit with a status of 0 if there are no errors.
.SH ENVIRONMENT VARIABLES
See \fIaegis\fP(1) for a list of environment variables which may affect
this command.
See \fIaepconf\fP(5) for the project configuration file's
\fIproject_\%specific\fP field for how to set environment variables for
all commands executed by Aegis.
.br
.ne 1i
.SH SEE ALSO
.TP 8n
.IR aeb (1)
build also takes a baseline read lock (non-exclusive)
.TP 8n
.IR aecp (1)
copy file also takes a baseline read lock (non-exclusive)
.TP 8n
.IR aedb (1)
begin development of a change
.TP 8n
.IR aeipass (1)
integrate pass takes a baseline write lock (exclusive)
.TP 8n
.IR aepconf (5)
project configuration file format
.TP 8n
.IR aeuconf (5)
user configuration file format
.\"
.\"	aegis - project change supervisor
.\"	Copyright (C) 1991-1995, 1997, 2006-2008 Peter Miller
.\"
.\"	This program is free software; you can redistribute it and/or modify
.\"	it under the terms of the GNU General Public License as published by
.\"	the Free Software Foundation; either version 3 of the License, or
.\"	(at your option) any later version.
.\"
.\"	This program is distributed in the hope that it will be useful,
.\"	but WITHOUT ANY WARRANTY; without even the implied warranty of
.\"	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
.\"	GNU General Public License for more details.
.\"
.\"	You should have received a copy of the GNU General Public License
.\"	along with this program. If not, see
.\"	<http://www.gnu.org/licenses/>.
.\"
.br
.ne 2i
.SH COPYRIGHT
.ds v) 4.24.3
.ds V) 4.24.3.D001
.ds o) 0
.ds p) 4.25
.ds u) 4.24
.ds Y) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
\*(n) version \*(V)
.br
.if t .ds C) \(co
.if n .ds C) (C)
Copyright \*(C) \*(Y) Peter Miller
.PP
The \*(n) program comes with ABSOLUTELY NO WARRANTY;
for details use the '\fI\*(n) -VERSion License\fP' command.
This is free software
and you are welcome to redistribute it under certain conditions;
for details use the '\fI\*(n) -VERSion License\fP' command.
.br
.ne 1i
.SH AUTHOR
.TS
tab(;);
l r l.
Peter Miller;E-Mail:;millerp@canb.auug.org.au
\f(CW/\e/\e*\fR;WWW:;http://www.canb.auug.org.au/~millerp/
.TE