1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176
|
'\" t
.\" aegis - project change supervisor
.\" Copyright (C) 1991, 1992, 1993, 1996, 1998, 1999 Peter Miller;
.\" All rights reserved.
.\"
.\" 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 2 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, write to the Free Software
.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
.\"
.\" MANIFEST: manual entry for 'aegis -Integrate_Pass' command
.\"
.so z_name.so
.TH "\*(n) -Integrate_Pass" 1 \*(N) "Reference Manual"
.SH NAME
\*(n) -Integrate_Pass \- pass a change integration
.XX "aeipass(1)" "pass a change integration"
.SH SYNOPSIS
.B \*(n)
.B -Integrate_Pass
[
.IR option ...
]
.br
.B \*(n)
.B -Integrate_Pass
.B -List
[
.IR option ...
]
.br
.B \*(n)
.B -Integrate_Pass
.B -Help
.SH DESCRIPTION
The
.I \*(n)
.I -Integrate_Pass
command is used to
notify \*(n) that a change has passed integration.
The change is advanced
from the
.I "being integrated"
state to the
.I "completed"
state.
.PP
This command updates the file histories, so that future
.IR aecp (1)
commands may extract previous file versions from history,
and so that future
.IR aed (1)
commands may merge out-of-date files.
The history is updated using the
.I history_create_command
and
.I history_put_command
fields of the project
.I config
file (see
.IR aepconf (5)
for more information). The integrate pass will abort with an error if
one of these history commands should fail, \fIe.g.\fP by running out of disk
space. If this should happen, the change will remain in the
.I "being integrated"
state, and the integration directory is unaltered.
.SH History Tools Modify Files
Many history tools (\fIe.g.\fP RCS and SCCS) can modify the contents of
the file when it is committed. This usually requies the use of specific
\&``keyword'' strings, and there are usually options to turn this behavior
off, but users familiar with version control tools (as opposed to
configuration management systems) will often use these features.
The problem is that if the commit changes the file, the source file in
the repository now no longer matches the object file in the repository.
.I I.e.
the history tool has compromised the referential integrity of the
repository. By default, a fatal error is emitted if the file is changed
by the check-in, however this can be modified to a be warning or even
ignored completely; see the
.I history_\%put_\%trashes_\%file\fP
field of
.IR aepconf (5)
for more information.
.PP
Once the history has been updated, the integration directory is renamed
as the baseline directory, and the old baseline directory is deleted.
The modification times of all files modified since the beginning of
integration (see
.IR aeib (1)
for more information) are updated to be since the beginning of integrate
pass. The order of modification times will be preserved, however the
time range will be compressed to the greatest extent possible. This
ensures that subsequent development builds will notice that baseline
files have changed.
.PP
Once integrate pass is complete
the change is no longer assigned to the current user.
.so z_bl_lock.so
.SS The History Lock
Where a project has a number of branches active simultaneously, it is
possible for independent integrate pass commands for different branches
to be issued very close together.
The is an exclusive
.I "history lock"
taken by integrate pass to ensure that only one branch is
updating the file history at a time,
thus preventing history file corruption.
.so z_test_corr.so
.so z_metrics.so
.SH OPTIONS
The following options are understood:
.so o_change.so
.so o_help.so
.so o_list.so
.so o_nolog.so
.so o_project.so
.so o_terse.so
.so o_verbose.so
.so o_wait.so
.so o__rules.so
.SH RECOMMENDED ALIAS
The recommended alias for this command is
.nf
.ta 8n 16n
csh% alias aeipass '\*(n) -ipass \e!* -v'
sh$ aeipass(){\*(n) -ipass "$@" -v}
.fi
.SH ERRORS
It is an error if
the change is not assigned to the current user.
.br
It is an error if
The change is not in the
.I "being integrated"
state.
.br
It is an error if
there has been no successful
.I "'\*(n) -Build'"
command for the integration.
.br
It is an error if
there has been no successful
.I "'\*(n) -Test'"
command for the integration.
.br
It is an error if
there has been no successful
.I "'\*(n) -Test -BaseLine'"
command for the integration.
.so z_exit.so
.br
.ne 1i
.SH SEE ALSO
.TP 8n
.IR aeib (1)
begin integration of a change
.TP 8n
.IR aeifail (1)
fail integration of a change
.TP 8n
.IR aemetrics (5)
metrics values file format
.TP 8n
.IR aeuconf (5)
user configuration file format
.so z_cr.so
|