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
- Checkout Tiki 18
- From the 18.x directory (you may have to do 'cd 18.x'):
svn merge -c 38634 ^/trunk
svn merge -c 48272 ^/branches/19.x
On Windows, the last argument may need quoting with double quotes ("^/branches/19.x")
- Test your commit. Be very careful to avoid regressions (This is the stable branch!)
- 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 .
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...]
Other pages related to merging:
11 pages found for title search 'merg'
- Semi-automatic merging period
- Merging back changes from a fork
- Merge Tiki Spreadsheet into Tiki Trackers
- Merge language improvements
- Merge Files
- Merge categories on dev.tiki.org
- Merge a commit between branches
- Mass operations to do after the Semi-automatic merging period
- Mail Merge
- How to Submit a Merge Request