I have a branch called foo. I have foo checked out into a working directory. I have some modified files in the working directory. I wanted to merge in changes that occurred on the main branch since the branch was created. I checked out the head of the main branch, tagged it foo-merge-1. Then I went to the branch working directory & did: cvs update -r foo -r foo-merge-1 What I got instead of merging in changes from the branch start to main head was merging in changes from the branch head to the main head, thus undoing changes from the branch start to the branch head. This is because I thought -r foo would refer to the start of the branch, when in fact it refers to the head of the branch. How do I recover gracefully, given that I didn't tag the branch start & didn't tag before the merge? -- Harvey Stein Bloomberg LP [EMAIL PROTECTED]
