Commit to a proposals branch

Related: Quality Team

1. Checkout the code from the proposed branches
   
   Checking out the new stable directory (6.x)

   svn checkout https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/branches/proposals/6.x .

   
   
2. Merge specific commit from trunk or other branch
   
   Merge revision 19139 from trunk

   svn merge -r19138:19139 https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/trunk

   
   
   
   Merge revision 35100 from branch 7.x

   svn merge -r35099:35100 https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/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
   
   
   Cherry picking 19139

   svn diff -c 19139 https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/trunk
   svn merge -c 19139 https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/trunk

   
   
3. Test
   Solve any conflict
   Test tikiwiki - It is a good idea to have proposals branches installed and operational.
   Be very careful to avoid regressions.
   
   Some useful svn tools

   #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

   
   
4. Commit
   

   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...]

• Propose to stable branch
• Commit to a proposed branch