Opened 6 years ago
Closed 6 years ago
#816 closed upgrade (Done)
VERY IMPORTANT: Reconciling GIT and SVN repositories
Reported by: | arango | Owned by: | |
---|---|---|---|
Priority: | major | Milestone: | Release ROMS/TOMS 3.7 |
Component: | Nonlinear | Version: | 3.7 |
Keywords: | Cc: |
Description (last modified by )
The GIT repository was modified to include the correct information about SVN properties (URL, revision, and modification date) along with with the GIT properties for URL and commit hash.
Both the SVN and GIT trunks are identical except for the makefile and ROMS/Version which have a couple of extra commands.
For example, the ROMS standard output will include repository and revision information:
GIT Root URL : https://www.myroms.org/git/src GIT Revision : 2f07d7f23c47cb2a2364ff8b653addd1ebd0c699 SVN Root URL : https://www.myroms.org/svn/src/trunk SVN Revision : 967
And the output NetCDF files global attributes will include:
:git_url = "https://www.myroms.org/git/src" ; :git_rev = "2f07d7f23c47cb2a2364ff8b653addd1ebd0c699" ; :svn_url = "https://www.myroms.org/svn/src/trunk" ; :svn_rev = "967" ;
Warning:
- If you are downloading the source code from the GIT repository for the first time, you need to execute the following command after cloning (git clone https://joe_roms@www.myroms.org/git/src MyDir) from inside your chosen MyDir for ROMS code to activate the updating of the git hash properties in each file:
git config filter.id.smudge ".git_filters/id.smudge %f"
- If you already downloaded the code from the GIT repository, you need to execute a git pull to update your repository, and then issue:
git config filter.id.smudge ".git_filters/id.smudge %f"
The activation of the above instructions for the hash property needs to be done only once.
For more information, check WikiROMS.
Change History (1)
comment:1 by , 6 years ago
Description: | modified (diff) |
---|---|
Resolution: | → Done |
Status: | new → closed |