bmerge(1) UNIX Programmer's Manual bmerge(1)
NAME
bmerge - merge branch revisions
SYNOPSIS
bmerge [ bcs_options ] [ file_options ]
[branchmerge_options] [ file ... ]
bcs_options:
[ -auto -fast -debug -quiet -rc -sb -set -newset
-newconfig -path -newpath ]
file_options:
[ -all -wall -nowall -allb -wallb -nowallb -find
-wfind -nowfind]
branchmerge_options:
[ -r ]
FLAGS
bcs_options - Defaults may be modified and/or overridden with
the following switches.
-auto
Automatically choose the default answer to any question
asked by a command. If the default answer requires
manual intervention of some sort (e.g. to edit a file),
then revert to interactive mode for the duration of the
remaining operations for the current file and only
return to automatic mode after proceeding to the next
file in the list.
-fast
Always choose the default answer to any question asked
by a command. If the default answer requires manual
intervention of some sort (e.g. to edit a file), then
abort the operation on the current file instead and
proceed to the next file in the list.
-debug
Enable debugging code.
-quiet, -q
Be less verbose about actions taken.
-rc sandbox_rc_file
Specifies an alternate sandbox rc file. The defaults
is $HOME/.sandboxrc.
-sb sandbox_name
Name of the sandbox to use. If this option is not
used, the sandbox will be determined by the environment
variable SANDBOX or, if that is not set, by the user's
Printed 1/23/91 4/25/90 1
bmerge(1) UNIX Programmer's Manual bmerge(1)
default sandbox as specified in the sandbox rc file.
-sb_rc sandbox-rcfile
Provides the path and name of the sandbox's rc file to
use instaed of the default file sandbox/rc_files/local.
If this option is not used, the default sandbox rc file
will be used.
-set set_name
Performs operation on set_name instead of the current
default set.
-path path
Use path as the current directory within the shadow
source area. Used in conjunction with the -newpath
option.
-newpath
Create and/or update the ./.BCSpath-<user_set_name> to
contain the current relative path within the shadow
source area. This file is used by workon to chdir
within to the same subdirectory when working on a set
over an extended period of time.
file_options - These options cause the list of affected file
names supplied on the command line to be extended.
-all All files in the current set are operated on. If this
option is not chosen, the user must list the files to
use. The files in the set are listed in the sandbox's
source directory in the file .BCSset- user_setname.
-wall
The same as -all. but only operates on the files in the
set that are also writable.
-nowall
The same as -all. but only operates on the files in the
set that are not writable.
-alls user_set_name
The same as -all -set user_set_name.
-walls user_set_name
The same as -wall -set user_set_name.
-nowalls user_set_name
The same as -nowall -set user_set_name.
-find pattern
First use all files found recursively with find(1)
beginning at the current directory that match pattern,
Printed 1/23/91 4/25/90 2
bmerge(1) UNIX Programmer's Manual bmerge(1)
then use those on the command line.
-wfind pattern
The same as -find except use only writable files.
-nowfind pattern
The same as -find except use only non-writable files.
pattern (with any trailing ",v" suffix stripped from
all names), then use those on the command line.
branchmerge_options - A number of the regular RCS switches are
also supported
-rrev
operates from revision rev instead of the default
DESCRIPTION
This command acts as a front-end to the regular branchmerge
command.
The regular RCS -r switch is used to name the
branch/revision which is to be merged onto the current
branch. A revision from this branch is locked for subse-
quent check-in of the merged file unless the -u switch is
used. An opportunity is provided to interactively edit the
merged file, which is especially important if the merge pro-
duced conflicts which must be resolved manually. At this
point, it is also possible to check-out the previous version
on the branch as file (i.e. when no changes from the -r
branch/revision are applicable after the merge), to check-
out the -r branch/revision as file (i.e. when no changes
from the current branch are applicable after the merge), to
compare this file to the previous version on the branch, to
compare this file to the -r branch/revision from which it
was merged, and to perform the merge operation over again
(when manual editing of the merged file has been botched so
thoroughly as to suggest that starting over again from the
top may be prudent).
The merge operation is always performed to a temporary copy
of file since it may produce conflicts. At the successful
completion of each branchmerge command, this temporary ver-
sion is copied back to file and is added to the ./.BCSset-
<branch-name> file if necessary.
FILES
~/.sandboxrc
rc file that specifies default sandbox
rcfiles/sets
Printed 1/23/91 4/25/90 3
bmerge(1) UNIX Programmer's Manual bmerge(1)
list of valid sets in sandbox
.BCSconfig-<user_set_name>
RCS configuration definition for branch (base direc-
tory)
.BCSpath-<user_set_name>
relative directory for branch within shadow area
.BCSset-<user_set_name>
list of files in branch (base directory)
.BCSlog-<user_set_name>
record of log messages for branch (base directory)
/tmp/b-$USER/*
temporary files
SEE ALSO
bcs(1), bci(1), bsubmit(1), branchmerge(1), rcsci(1),
rcs(1), rcsintro(1),
the RCS Cookbook.
Printed 1/23/91 4/25/90 4