> I previously did a cvs import of 'third party code'. I have > been making changes to the code, and checking these into cvs. > I have done another import of the 'third party code'. I was > hoping that I could pick only the parts of this latest code > that I wanted to merge in with my changes. However cvs asks > me to merge in all the changes. When a do a 'cvs -n update' > it lists all the files that have changed on the vendor branch > as having to be updated on the main trunk. Aren't these two separate > branches of code ? How can I prevent having to merge all the > changes on the vendor branch ?
Use the 'M-x ediff-files' feature of Emacs. This will get the job done very simply. You can then pick and choose which diffs to apply. It's one of my favorite Emacs features. -Doug _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
