Stephen L Arnold wrote:
>In the section on Tracking Third-Party Sources (in the main CVS
manual), it talks about importing code for the first time like this:
>
>$ cd wdiff-0.04
>$ cvs import -m "Import of FSF v. 0.04" fsf/wdiff FSF_DIST WDIFF_0_04
>
>where the last two arguments above are the Vendor_tag and
Release_tag. Then, to update the repository to the latest vendor
source, do this:
>
>$ tar xfz wdiff-0.05.tar.gz
>$ cd wdiff-0.05
>$ cvs import -m "Import of FSF v. 0.05" fsf/wdiff FSF_DIST WDIFF_0_05
>
>I assume this pre-supposes that the new version (wdiff-0.05) has the
same directory structure, and the same set of (modified) source files
as the previous version. What happens if the organization of the
source tree was changed? How much can CVS do on it's own, or do I
basically have to analyze all the changes beforehand and do a whole
slew of "cvs add" "cvs rm" etc? (I was hoping CVS would help with
this part).
If you do the following after performing the above commands, it will
resolve any changes in directory structure:
cvs co -j WDIFF_0_04 -j WDIFF_0_05 fsf/wdiff
This should merge the differences between version 0.04 and 0.05 and
put it on the head of the tree. If you have made any changes to any
files you may have some conflicts. If you find any, resolve them and
then check the results in. This will remove any files that aren't in
version 0.05 and add any files that were added in 0.05.
Hope this helps.
--
Stephen Rasku E-mail: [EMAIL PROTECTED]
Senior Software Engineer Web: http://www.tgivan.com/
TGI Technologies http://www.pop-star.net/
