Updating a Baselibs Component: Difference between revisions
Added Category |
m →Importing NCO 4.2.3: Cleanup newlines |
||
| Line 22: | Line 22: | ||
$ tar xzf nco-4.2.3.tar.gz | $ tar xzf nco-4.2.3.tar.gz | ||
b. Move into netcdf directory: | b. Move into netcdf directory: | ||
| Line 30: | Line 30: | ||
$ bcvs -nq 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 -nq 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 | ||
d. Really import the package | d. Really import the package | ||
| Line 54: | Line 54: | ||
(remove -nq and run again once satisfied) | (remove -nq and run again once satisfied) | ||
g. Move into nco | g. Move into nco | ||
$ cd Baselibs/src/nco | $ cd Baselibs/src/nco | ||
h. Check for conflicts | h. Check for conflicts | ||
$ bcvs -nq upd -kk | grep -r '^[C|M]'TmpBaselibs | $ bcvs -nq upd -kk | grep -r '^[C|M]'TmpBaselibs | ||
cvs update: New directory `autom4te.cache' -- ignored | cvs update: New directory `autom4te.cache' -- ignored | ||
cvs update: New directory `debian' -- ignored | cvs update: New directory `debian' -- ignored | ||
| Line 108: | Line 108: | ||
No conflicts found. | No conflicts found. | ||
j. Commit changes | j. Commit changes | ||
$ bcvs commit -m "MAT: merge new NCO release 4.2.3, no conflicts found" | $ bcvs commit -m "MAT: merge new NCO release 4.2.3, no conflicts found" | ||
5. Tag new release at src level | 5. Tag new release at src level | ||