Schwenk, Jeanie writes:
>
> +---------+ +---------+
> Branch 1.8 -> _! 1.8.2.1 !----! 1.8.2.2 !
> / +---------+ +---------+
> /
> /
> +-----+ +-----+ +-----+ +-----+ +------+
> ! 1.7 !----! 1.8 !----! 1.9 !----! 1.10 !----! 1.11 ! <- trunk
> +-----+ +-----+ +-----+ +-----+ +------+
>
> He wants to merge the changes from 1.8.2.2 into 1.11.
"Changes from 1.8.2.2" is a meaningless phrase -- changes are what
happen *between* revisions. To merge all the changes from that branch
into the trunk, you want to do (assuming your working directory is
already up-to-date on the trunk, if not, do update -A first):
cvs update -j 1.8.2 filename.java
(The branch tag for 1.8.2 would be better than the actual revision
number of the branch -- you did tag the branch when you created it,
didn't you?) Note carefully that you need to give update the *branch*
tag or number, not the tag or number of a specific revision. A branch
tag means all the changes between the root of the branch and the tip of
the branch. In this case, that's equivalent to:
cvs update -j 1.8 -j 1.8.2.2 filename.java
I think you both need to go back and carefully re-read the Branching and
merging section of the manual:
<http://www.cvshome.org/docs/manual/cvs_5.html#SEC54>
-Larry Jones
They can make me do it, but they can't make me do it with dignity. -- Calvin
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
