Well the next article I looked at showed me how to accomplish this. Sorry for the OT. I didn't realize you could pass "HEAD" to the -j option.
But, here's the solution: switch to the branch and then: cvs update -j MY_BRANCH -jHEAD myFile This merges all changes in the trunk since the branch was made into the branch. Erik -----Original Message----- From: [EMAIL PROTECTED] Sent: Aug 22, 2005 12:28 AM To: [EMAIL PROTECTED] Subject: [OT] CVS help needed I hope one of you fellow night owls can help me. I have a CVS problem that doesn't come up much I guess. I need to merge files from the trunk to a branch. Note that this is the *opposite* of a common situation -- where the need is to merge files from a branch to the trunk. A branch was created several days ago. However, I continued to commit to the trunk, whereas I should have immediately switched to the branch and started committing there. So now I have many files that are three or four versions ahead in the trunk, and those changes are needed in the branch. How do I update my files in the branch with the latest versions of those files from the trunk, meanwhile keeping the sticky tag on the branch intact? Thanks for any help, Erik --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
