Redmine

Update of the Redmine Git repository¶

The local Redmine Git repository needs to be updated to check whether the existing patches are still applicable to the new version.

• Table of contents
• Update of the Redmine Git repository
  • 1 Fetch changes from the upstream repo
  • 2 Push changes to your own GitHub repo
  • 3 View changes
  • 4 Update the develop branch (optional)
  • 5 Creating new branches

The working copy of the Redmine git repository needs to be updated. The following steps are necessary:

1 Fetch changes from the upstream repo¶

# Update Redmine master branch without merge
git checkout master
git pull --rebase upstream master
git fetch upstream --tags

# Update stable branch without merge
git checkout 5.1-stable
git pull --rebase upstream 5.1-stable
git checkout 6.0-stable
git pull --rebase upstream 6.0-stable

2 Push changes to your own GitHub repo¶

The GitHub repo should be updated as follows:

git push github master
git push github --tags
git push github 5.1-stable
git push github 6.0-stable

3 View changes¶

The changes between the last version and the current ones are to be reviewed to reveal changes for xmera Omnia as early as possible.

git diff (last-version)..(current-version)

If it is a feature or major release, the analysis of the differences should be more detailed.

1. List patch files of the plugins:

# Files in lib
(user)@(host):~/path/to/xmera_omnia/repo$ find . -name *patch.rb

# Views in app
(user)@(host):~/path/to/xmera_omnia/repo$ find . -wholename *app/overrides/*.rb

2. Create tickets that show the diff snippet for each relevant change in the Redmine code and the list of affected plugins.
3. Work through the tickets to ensure that even patched files include the current Redmine code, if appropriate.

4 Update the develop branch (optional)¶

If there is no develop branch do:

git checkout develop
git merge master

5 Creating new branches¶

Check out the relevant version of Redmine. On this basis, patches will be created.

git checkout <latest-version>
git checkout -b develop-<latest-version>

git diff --name-only (last-version)..(current-version)