.TH CVSQ-MERGE 1 "April 24, 2007" "" ""
.SH NAME
cvsq-merge - set up the files to merge in a change that went to a branch via cvsq-branch

.SH SYNOPSIS
\fBcvsq-merge [-l] .<tag>\fR
.br

.SH DESCRIPTION
Usually, cvsq-merge is called when after an update a file 
named .cvsq-branch-... is found. This file signals that a commit was
redirected to a branch via cvsq-branch(1). Then cvsq-merge is called
with this file name as argument. It will set up two symbolic l
inks .origin and .branch to a copy of the working directory updated to the
beginning and the end of the identified branch.

The beginning of the branch is created by copying the current
directory and calling "cvs update -r<tag>-start" in the copy; the end
of the branch is created by copying the current directory and calling
"cvs update -r<tag>" in the copy.

.SH OPTIONS
\fB-l\fR
.br
Use lcvs(1) instead of cvs(1) to update the copies of the working
directory.


.SH FILES
\fB~/.cvsq-branch/merge/<tag>\fR
.br
This directory contains the subdirectories origin and branch which
contain a copy of the working directory updated to the beginning and the end of the branch.

.SH SEE ALSO
.BR cvsq-branch "(1), "lcvs "(1), "cvsq "(1), "cvs "(1)"

.SH AUTHOR
Klaus Aehlig <aehlig@linta.de>