Difference between revisions of "Merging WPS"

From openwfm
Jump to navigation Jump to search
(3.3.1)
(checkout)
Line 7: Line 7:
 
git fetch wrf-fire
 
git fetch wrf-fire
 
git checkout -b wrf-fire-track/master wrf-fire/master
 
git checkout -b wrf-fire-track/master wrf-fire/master
 +
git checkout -b wrf-fire-track/wps3.4 wrf-fire/wps3.4
 
</pre>
 
</pre>
etc.
 
  
 
==Compare WPS versions==
 
==Compare WPS versions==

Revision as of 02:03, 24 April 2019

Clone WPS and add wrf-fire as a branch

git clone git@github.com:wrf-model/WPS.git
cd WPS
git remote add wrf-fire git@github.com:openwfm/wrf-fire.git
git fetch git@github.com:openwfm/wrf-fire.git
git fetch wrf-fire
git checkout -b wrf-fire-track/master wrf-fire/master
git checkout -b wrf-fire-track/wps3.4 wrf-fire/wps3.4

Compare WPS versions

3.3.1

git checkout wrf-fire-track/wps3.4
git checkout HEAD^
HEAD is now at 5e1819bd WPS update to version 3.3.1
cp -a WPS ../wps3.3.1
git checkout RELEASE-3-3-1
HEAD is now at bedb19c7 tagging 3.3.1 release
 diff -r -x .git . ../wps3.3.1
Only in .: test_suite
Only in ./util: make_regression_data.tar
Only in ./util: regtest_wps.csh
Only in ./util: wps_reg.html
Only in ./util: wps_reg_html_maker.csh
Only in ./util: zap_reg.csh