16,602
edits
Changes
m
no edit summary
patch -p0 < mypatch.patch
There is a more convenient way though: use svn merge. For this you commit your changes in the branch, and write down the revision number, eg a commit in branch31 branch{{stable_branch}} :
Transmitting file data ..
Committed revision 12345.
Now you apply this change in branch31 to trunk as follows. Go into your trunk working branch, and there type the command:
svn merge -c 12345 https://gramps.svn.sourceforge.net/svnroot/gramps/branches/gramps31gramps{{stable_branch}}
The change will then be obtained and applied, after which you can commit trunk.
[[Category:Developers/General]]
