manual
405
edits
Changes
From Gramps
m
remove auto links
To create a branch from the ''trunk'':
svn copy <nowiki>https://svn.code.sf.net/p/gramps/code/trunk https://svn.code.sf.net/p/gramps/code/branches/geps/gep-014-fab-feature</nowiki>
=== Merging ''trunk'' changes into the branch ===
cd gep-014-fab-feature
svn merge <nowiki>https://svn.code.sf.net/p/gramps/code/trunk</nowiki>
'''NOTE''' you will see some modification to files that you are not expecting. If you look at these you will find that they are modifications to svn properties. These are used by the merging tool to keep track of what changes have already been applied.
cd gep-014-fab-feature
svn merge <nowiki>https://svn.code.sf.net/p/gramps/code/trunk</nowiki>
svn commit -m "meaningful message"
cd trunk
svn merge --reintegrate <nowiki>https://svn.code.sf.net/p/gramps/code/branches/geps/gep-014-fab-feature</nowiki>
Now build it, test it, convince yourself that it all works and then commit the changes:
Now you '''must''' delete your branch. You can recreate it later if you need to but svn can not cope with doing another merge --reintegrate from the same branch:
svn remove <nowiki>https://svn.code.sf.net/p/gramps/code/branches/geps/gep-014-fab-feature</nowiki>
=== Removing branches ===
into the trunk or have been abandoned. To remove a branch:
svn remove <nowiki>https://svn.code.sf.net/p/gramps/code/branches/geps/gep-014-fab-feature</nowiki>
The developers reserve the right to remove branches that have been
