As part of transitioning CABLE from SVN to GitHub, we will want to clean up the CABLE repository of unnecessary branches. There are 2 categories of branches we do not want to transfer:
- stale branches, i.e. a branch that is not actively being worked on anymore.
- branches to record a configuration, i.e. a branch with only changes to namelists and other input files.
We realise this is a significant change of practice and we may need to be flexible at the start to allow people some time to adapt. As such, we would like CABLE users to identify and share with us what current code branches they will need once we move CABLE to GitHub.
The SVN repository will be accessible after the transition and it will be possible to transfer forgotten branches afterwards. However, getting most branches right at the start will save time and effort for the CABLE maintainers.
At this time, we will not transfer the data from CABLE-AUX. The SVN repository will still be the source of ancillary data for CABLE.
What we need you to do
If you have branches you would like to keep, please reply to this topic before Friday 27 October with the URL to the branch you want to keep. Please indicate a ticket number if there is a TRAC ticket associated with that branch. If the branch does not have recent commits, please indicate why you would like to keep the branch.
Note that some branches might be replaced by git tags as the use of tags and branches is slightly different between git and SVN. This will be advertised appropriately
What do I do if Iām unsure if a branch meets the criteria?
Please answer on this topic with the branch and the reasons you would like to keep it. We will let you know what is the best option for that specific branch.
What do I do if I need to create a branch after 27 October but before the move to git?
We will update the list of branches at the time of the transition to include all recent, non-empty branches in addition to the branches requested. But feel free to post on this topic past 27 October as well to highlight the branch.
What do I do if I am actively working on a branch under SVN at the time of the transition?
Here is our advice:
- Make sure all your changes to your SVN branch are committed to the SVN repository on the day before the transition.
- Do NOT work on your SVN branch on the transition day.
- The day after the transition, clone the GitHub repository, checkout your branch and continue your work there using git and GitHub. At this stage, you can safely delete your SVN-based work directory (assuming you have committed everything to SVN before the transition!).
What do I do if I have branches to record configurations?
If you do not want to change these configurations, you can keep these branches on SVN since you will keep read access.
If you want to modify these configurations or ensure a longer-term storage for them, the best is for you to save these branches as git repository(ies) under your GitHub space. Saving the branches within a single repository might be the easiest option, but having a repository per branch is possible if preferred. This can be done at any time before or after the transition to GitHub since the SVN repository will keep reading access.
What do I do if I have branches or know of branches used for code references in publications?
The SVN repository will be kept for 7 years so that the references in publications stay valid. These branches do not need to be transferred to GitHub.
Branches to transfer
| Branch name | TRAC ticket | Git branch or tag? | Requestor | Branch URL |
|---|---|---|---|---|
| CABLE-POP_TRENDY | branch | JĆ¼rgen Knauer, Matthias Cuntz, Pep Canadell, Benjamin Smith, Ian Harman | https://trac.nci.org.au/svn/cable/branches/Share/CABLE-POP_TRENDY | |
| NESP2pt9_BLAZE | branch | Pep Canadell, Benjamin Smith, Ian Harman, JĆ¼rgen Knauer, Matthias Cuntz | https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE | |
| NESP2pt9_CROP | JĆ¼rgen Knauer, Tammas Loughran | / ā cable | ||
| BLAZE_9184 | branch | Ian Harman, Yohanna Villalobos, Lars Nieradzik | https://trac.nci.org.au/trac/cable/browser/branches/Users/inh599/BLAZE_9184 | |
| 173-thresholds-in-albedo (GitHub issue: 173) | 334 | branch | Ian Harman | https://trac.nci.org.au/trac/cable/browser/branches/Users/inh599/Ticket334 |
| Ticket 337 (this ticket is closed since #359 implemented the change, branch might not be needed) | 337 | branch | Ian Harman | https://trac.nci.org.au/trac/cable/browser/branches/Users/inh599/Ticket337 |
| 171-bug-in-offline-zenith-angle-calculation (GitHub issue: 171) | 339 | branch | Ian Harman, ACCESS user community | https://trac.nci.org.au/trac/cable/browser/branches/Users/inh599/Ticket339 |
| CableHydraulics | branch | Manon Sabot, Martin De Kauwe, Andy Pitman | https://trac.nci.org.au/trac/cable/browser/branches/Users/ms8355/CableHydraulics | |
| CABLE-2.4 | tag? | Claire Carouge | https://trac.nci.org.au/svn/cable/tags/CABLE-2.4-ACCESS-ESM1.5 | |
| CABLE-2.5 | tag? | Claire Carouge | https://trac.nci.org.au/svn/cable/tags/CABLE-2.5-ACCESS-CM2 | |
| DevBr-1 | branch | Ramzi Kutteh | https://trac.nci.org.au/svn/cable/branches/Users/rk4417/DevBr-1 | |
| DevBr-2 | branch | Ramzi Kutteh | https://trac.nci.org.au/svn/cable/branches/Users/rk4417/DevBr-2 | |
| Marks_latest_branch_with_fixes_mmy_trunk | branch | Mengyuan Mu | https://trac.nci.org.au/trac/cable/browser/branches/Users/mm3972/Marks_latest_branch_with_fixes_mmy_trunk |