cvs update -j HEAD -j R18 <your file names>
This also assumes that there are no commits to main trunk after your required changes. otherwise they will also be merged into the branch.
HTH Rohan
news wrote:
Hello,
I have a "main trunk" and a branch "R18". Some changes (on 3 files) have been made by programmer on the main trunk but they should have been done in the R18 branch. I'd like the changes made on the three files to be merged (or just copied) to the R18 branch. Of course, the R18 branch should continue to "live" but with the changes (I hope my english is good enougth...).
Thanks.
Jean
_______________________________________________ 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
