Related: Quality Team
- Checkout the code from the proposed branches
svn checkout http://svn.code.sf.net/p/tikiwiki/code/branches/proposals/6.x .
- Merge specific commit from trunk or other branch
svn merge -r19138:19139 ^/trunk
svn merge -r35099:35100 ^/branches/7.x
The cherry picking method can also be used. First check you have the good commit by running a diff, then merge the commit
svn diff -c 19139 ^/trunk svn merge -c 19139 ^/trunk
Solve any conflict
Test tikiwiki - It is a good idea to have proposals branches installed and operational.
Be very careful to avoid regressions.
#To see what will be commit svn diff | more #To pick again the version in trunk of this_file svn revert this_file #After conflict and edition, to tell svn that the version in proposed is the good one (commands depend on svn version svn revolved this_file svn resolve --accept working this_file
svn commit -m "[bp/r19139][FIX] Mindmap was broken by changes to the flash plugin" tiki-mindmap.php
It starts with "[bp/r19139]", which means that it is a backport of a fix/feature commited on trunk at revision 19139. Then it is followed by the original commit message made on trunk. If multiple commits has 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...]