SVN updates (for all versions of Tiki) will stop in January 2023. This coincides with when Tiki18 reaches end of life. However, even if you use another version (like Tiki 21x) from SVN, you will stop getting updates because the Git and SVN combined workflow will be retired. You should get your updates from Git. See also: Tiki Version control history.






Say you commit a fix to SVN trunk (ex.: future 21.x), and you want to merge that commit to a stable branch (ex.: 18.x).

Since this merge is from a later version (21.x) to an older version, it is called a "backport". You can also backport someone else's fix :-)

In this example, we'll merge the commit from trunk (revision 38634) to 18.x

  1. Checkout Tiki 18
  2. From the 18.x directory (you may have to do 'cd 18.x'):
    Merge revision from trunk to the current checkout)
    svn merge -c 38634 ^/trunk

    If you are backporting from a branch (in this case from 19.x to 18.x)
    svn merge -c 48272 ^/branches/19.x

    On Windows, the last argument may need quoting with double quotes ("^/branches/19.x")
  3. Test your commit. Be very careful to avoid regressions (This is the stable branch!)
  4. To see what will be committed
    svn diff | more

    If you see many conflicts, it's not a good idea to backport. It means the code has diverged too much.

    In that case you can revert recursively from the top of your working copy:
    svn revert -R .
  5. Commit
    svn commit -m "[bp/r38634] [FIX] Apparently glob(), this can fail on some systems, check required" lib/init/tra.php

    It starts with "[bp/r38634]", which means that it is a backport of a fix/feature committed on trunk at revision 38634. Then it is followed by the original commit message made on trunk. If multiple commits have been made on trunk to fix the same issue, they have to be proposed as one unique commit and the commit message will have multiple lines starting with [bp/r...]



Related:


Other pages related to merging:
11 pages found for title search 'merg'


alias

Merge a commit to a stable branch | Backport to a stable branch | Backport