2,186
edits
Changes
no edit summary
Whenever a bug is fixed in a branch, it is the committer's responsibility to make sure the fix is also committed to the trunk. This can be accomplished using one of three methods. All methods require a working copy of trunk and the branch.
The most common way to move changes between branches is by using the svn merge command. Assuming you have a working copy of trunk in ~/gramps/trunk and a working copy of the 3.3 branch in ~gramps/gramps33:
gramps33$ svn commit
trunk$ svn commit
You can also create a patch on gramps33 branch and apply it to trunk:
gramps33$ svn diff -r PREV > ~/mypatch.patch
trunk$ ./svnci
Make the change in the branch. Commit the change to the branch.