Robert Campbell writes:
>
> I have a problem where we originally had one cvsroot, with two branches
> of certain modules (lets call them MAIN and B)..... Then somebody went
> abroad and took
> a COPY of the cvsroot to work on branch B, meanwhile work on branch
> MAIN continued in the office..... The problem is now that I want to
> merge in all of the changes
> that were done on branch B back into the main CVSROOT, so that I can
> then merge branch B into branch MAIN....
Assuming that no work has been done on branch B in the office and you
don't care about keeping all of the intermediate history, you can check
out a copy of branch B in the office, overwrite all of the files with
the current versions from abroad, and commit the changes. Then you can
merge the branch back into the trunk as usual.
-Larry Jones
I like maxims that don't encourage behavior modification. -- Calvin
