Eric, when you say trunk, do you mean head? If so, would it be feasible
to just delete the tag for your branch and re-tag head with that tag?
Assuming that ALL the changes in head are changes you want to add to the
branch, I *think* this will have the desired effect. Not sure if it has
an undesirable effect on history, that might be my only concern.
I have incidentally done this once or twice myself, not by accident but
just because something changed between the time I applied a tag and cut
a release and I wanted the change in the release, which is of course
based on a specific tag. I haven't seen any problems doing it.
Frank
[EMAIL PROTECTED] wrote:
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]
.
--
Frank W. Zammetti
Founder and Chief Software Architect
Omnytex Technologies
http://www.omnytex.com
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
