Upgrading the Web UI requires keeping track of the differences
between the plain vanilla Web UI and your customization changes. This procedure is required if
ugrading from Mobiliser Platform 5.1 SP01 or earlier.
Locate a copy of the vanilla source of the version of the Web UI which was the base
for your branch.
If your customization if based on the 5.1 release, get a copy of the original
sources and extract them into a directory.
Make a copy of your sources and place them in a second directory.
With these two directories, you can perform a diff that only
contains the changes made to your customization.
If you are using version control software, replace the web-ui
sources in it with the vanilla sources for 5.1 SP02, and commit this as the base for
the next step.
This step includes deleting any added files, so you have a pure vanilla version of
the web-ui. This step is not strictly necessary, but makes it easier to determine
which changes are your customizations and which changes came only from the upgrade.
Add back any changes/customizations you made to the plain vanilla upgraded version,
then perform a merge.
patch -p0 --merge < customisation.diff
This command leaves merge markers in the files for any conflicts that arise.
Resolve the conflictsm then check in the resulting state.
Tip: Carefully
resolve merge conflicts because the leading and trailing lines contain those lines
from the old version, which can be misleading when resolving
changes.