Re: Documentation suggested to clearer state restrictions to merging removed files

[Derek R. Price]

Linus Tolke wrote:

> If I do:
> cvs update -jbranchtag
>     a is removed
>     d is added
>     c is changed
> in the checked out copy of my main trunk.
>
> If I instead do:
> cvs update -j tag_on_branch
>     d is added
>     c is changed
> in the checked out copy of my main trunk.
> a is not removed!

Hmm.  You're right, and the culprit seems to be that 'cvs tag tag_on_branch'
run on the branch skips dead files (intentionally), so when a merge is
attempted from a single static tag, only changes in files containing the tag
are noticed and merged.

Comments on the following addition to the "update options" node?

 revision which the working directory is based on, and
 the revision specified in the @samp{-j} option.

+Note that using a single @samp{-j TAGNAME} option rather than
+@samp{-j BRANCHNAME} to merge changes from a branch will
+often not remove files which were removed on the branch since the dead
+revisions do not contain the static tag.  Use the branch tag to merge all
+changes on the branch or use two static tags as merge endpoints to be sure
+all intended changes are propagated in the merge.

 In addition, each @samp{-j} option can contain an optional
 date specification which, when used with branches, can

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:dprice@openavenue.com     OpenAvenue ( http://OpenAvenue.com )
--
A burp is not an answer.
A burp is not an answer.
A burp is not an answer...

          - Bart Simpson on chalkboard, _The Simpsons_