History: UsingLibrariesInCVS

Including 3rd party code in CVS

Let's say we want to import the excellent database abstraction layer
ADOdb version 3.60 into our CVS repository:
<tt>
$ wget http://phplens.com/lens/dl/adodb360.tgz
$ tar xvzf adodb360.tgz
$ rm adodb360.tgz
$ cd adodb
$ cvs import -m 'Imported ADOdb 3.60' adodb PHPLENS_COM R3_60
$ cd ..
$ rm -fr adodb
</tt>
Now, we're going to check it out from CVS and fix a bug we found:
<tt>
$ cvs checkout adodb
$ cd adodb
<i>...hack, chop, whittle...</i>
$ cvs commit -m 'Fixed bug #12345: Replace doesn't use native REPLACE command, if available'
$ cd ..
$ rm -fr adodb
</tt>
Now, we want to upgrade to version 3.70:
<tt>
$ wget http://phplens.com/lens/dl/adodb370.tgz
$ tar xvzf adodb370.tgz
$ rm adodb370.tgz
$ cd adodb
$ cvs import -m 'Imported ADOdb 3.70' adodb PHPLENS_COM R3_70
</tt>
This command completed successfully, but reported the following:
<tt>
1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -j<prev_rel_tag> -jR3_70 adodb </tt> So, let's delete the imported directory: <tt> $ cd .. $ rm -fr adodb </tt> And checkout as instructed above. <tt> $ cvs checkout -jR3_60 -jR3_70 adodb </tt> Manually resolve any conflicts that were reported. Now, let's commit our 3.60 changes into 3.70: <tt> $ cvs commit -m 'Merged our 3.60 changes into 3.70' </tt> And finally remove our directory: <tt> $ rm -fr adodb </tt>