In regard to: Re: import of multiple vendor versions + local mods, Larry...:
>Tim Mooney writes: >> >> Is there something I need to do (possibly between the 1st and 2nd imports, >> or maybe after the 2nd import) to let CVS know that `foobar.h' is not >> relevant for vendor versions past the first import (its been renamed to >> FooBAR.h in vendor versions #2 and #3). > >Yes, you need to do a merge after each import (other than the first) >even if there aren't any conflicts. WHEN you do it isn't particularly >important, so now would be a good time: > > cvs checkout -j FOOBAR_ORIG -j FOOBAR_20011020 contractsoft/FooBAR > cd foo > cvs commit -m'merge 20011020' > >You should do the same thing for the third import, but since you know >there weren't any structural changes, it isn't necessary. Thank you! The information you provided allowed me to do exactly what I needed to do, and I now have our contractsoft/FooBAR set up exactly the way we want it. You've been a tremendous help! Thanks for taking the time to clear up my confusion. >You are, unwittingly. You made a branch, but you haven't used it -- you >checked out the head rather than your branch, which is exactly the right >thing to do. Once you do the above merge, you should update your >working directory which should delete the defunct foobar.h and then you >can commit your changes (to the trunk). Tim -- Tim Mooney [EMAIL PROTECTED] Information Technology Services (701) 231-1076 (Voice) Room 242-J6, IACC Building (701) 231-8541 (Fax) North Dakota State University, Fargo, ND 58105-5164 _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
