Updating a Baselibs Component: Difference between revisions
m →Importing NCO 4.2.3: Cleanup newlines |
|||
| Line 34: | Line 34: | ||
$ bcvs import -kk -m 'MAT: import NCO 4.2.3 retrieved 2012-NOV-13 from http://nco.sourceforge.net/#Source' Baselibs/src/nco NCO release-4_2_3 | $ bcvs import -kk -m 'MAT: import NCO 4.2.3 retrieved 2012-NOV-13 from http://nco.sourceforge.net/#Source' Baselibs/src/nco NCO release-4_2_3 | ||
39 conflicts created by this import. | 39 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_2_3 Baselibs/src/nco | cvs -d :ext:mathomp4@progressdirect:/cvsroot/baselibs checkout -j<prev_rel_tag> -jrelease-4_2_3 Baselibs/src/nco | ||