Updating a Baselibs Component: Difference between revisions
| Line 44: | Line 44: | ||
205 conflicts created by this import. | 205 conflicts created by this import. | ||
Use the following command to help the merge: | Use the following command to help the merge: | ||
cvs -d :ext:mathomp4@progressdirect:/cvsroot/baselibs checkout -j<prev_rel_tag> -jrelease-4_3_2 Baselibs/src/netcdf | |||
Note that this command provides helpful information on how to merge this package. You'll want to make a note of the previous release tag. The best way to find this out is via tkcvs, in my opinion. | Note that this command provides helpful information on how to merge this package. You'll want to make a note of the previous release tag. The best way to find this out is via tkcvs, in my opinion. | ||