You have your "-j" backwards, should be
> cvs co -r latest_trunk_tag
> cvs update -j latest_trunk_tag -j latest_branch_tag
-chris
>-----Original Message-----
>From: [EMAIL PROTECTED]
>[mailto:[EMAIL PROTECTED]
>] On Behalf Of work
>Sent: Thursday, June 24, 2004 9:59 AM
>To: [EMAIL PROTECTED]
>Subject: Merge Branch to Trunk - Not Deleting Lines in Trunk
>
>
>When I merge from the file on the branch to the file on the
>trunk, and the
>file on the branch has deleted lines, the lines are not
>deleted from the
>file on the trunk.
>
>I'm in the local sandbox for the trunk and using the cvs update -j
>latest_branch_tag -j latest_trunk_tag and the output says that
>the file
>already contains the differences, but it really doesn't
>because the lines
>don't exist in the branch, but do in the trunk. Is there a
>way to force the
>lines to be removed from the trunk since they were removed
>from the branch?
>
>I can see why this might be undesirable, but in some cases, it
>is desirable
>to have bad code removed from both files without having to do
>it manually.
>
>Thanks,
>
>Rick Feldmann
>[EMAIL PROTECTED]
>
>
>_______________________________________________
>Info-cvs mailing list
>[EMAIL PROTECTED]
>http://lists.gnu.org/mailman/listinfo/info-cvs
>
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs
