Skip to content

further migration tweaks #520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jennyhickson merged 2 commits into from
Dec 5, 2025
Merged

further migration tweaks #520

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48a9b94
further migration tweaks
james-bruten-mo Dec 5, 2025
d8c38cc
move note
james-bruten-mo Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions source/WorkingPractices/branch_migration.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ a fork <forking>` of the repo you are migrating to.

Resolve any conflicts and then commit these changes to this branch,
``fcm ci``.

For Jules users, upgrading to the ``git_migration`` tag is required.

#. Move into your git clone and :ref:`create a new branch <create_branch>` with
the same start point as your fcm branch. If you are branching from an
untagged revision, you will need to manually find the relevant hash for that
Expand All @@ -57,15 +60,15 @@ a fork <forking>` of the repo you are migrating to.
If the ``git_migration`` tag doesn't exist in your clone, then you may need
to :ref:`sync tags <sync_fork_tags>`.

#. Rsync the changes over from the fcm export to the git clone. Use ``--delete``
to remove any files you have deleted in your branch. Use
#. Rsync the changes over from the fcm working copy to the git clone. Use
``--delete`` to remove any files you have deleted in your branch. Use
``--exclude=.git --exclude=.svn`` so that the version control directories
aren't modified.

.. code-block::

# NOTE: You need the trailing backslash on the fcm source path
rsync -av --delete --exclude=.git --exclude=.svn path/to/fcm/export/ path/to/git/clone
rsync -av --delete --exclude=.git --exclude=.svn path/to/fcm/working/copy/ path/to/git/clone

#. Check carefully the output of the rsync via ``git status``. If you have new
files on your branch these will need adding via ``git add``.
Expand All @@ -84,3 +87,6 @@ a fork <forking>` of the repo you are migrating to.
are expected when updating rose-stem changes to the initial release. The UM,
Jules and UKCA test suites have all had file extensions renamed from ``.rc``
to ``.cylc``.

For lfric_core a minor source code change has been added to github, which
may result in conflicts in ``components/lfric-xios/source/lfric_xios_file_mod.f90``