16,719
edits
Changes
From Gramps
m
→Bugfixes in branches
;Using svn merge
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.0 2 branch in ~gramps/gramps30gramps32: gramps30gramps32$ svn commit gramps30gramps32$ cd ../trunk
trunk$ svn merge -c REVISION https://gramps.svn.sourceforge.net/svnroot/gramps/branches/gramps30
trunk$ svn commit
;Using svn diff
You can also create a patch on gramps30 gramps32 branch and apply it to trunk: gramps30gramps32$ svn diff -r PREV > ~/mypatch.patch gramps30gramps32$ cd ../trunk
trunk$ patch -p0 < ~/mypatch.patch
