Changes between Version 28 and Version 29 of Development

Timestamp:

07/22/09 05:12:02 (4 years ago)

Author:

szabgab

Comment:

instructions for branching

Development

@@ -75 +75 @@
 = Development in a branch =
 
-Most of our development is done on the trunk but occasionally we prefer to make our private corner for experimental changes.
-Instructions on how to do that
+Most of our development is done on the trunk but occasionally we prefer to make our private corner for experimental changes
+or changes that might not be stable for some time.
+Instructions on how to do that:
 
+Create a branch and work on it:
+
+Assuming you have already checked out http://svn.perlide.org/padre/trunk/ to /path/to/padre
 
 {{{
 $ svn cp http://svn.perlide.org/padre/trunk/Padre http://svn.perlide.org/padre/branches/My-branch -m'some messages'
-$ cd trunk/Padre
+$ cd /path/to/padre/Padre
 $ svn switch http://svn.perlide.org/padre/branches/My-branch .
 }}}
 
-edit, commit as usual
-when done
+If you run 
+{{{
+svn st ..
+}}}
 
-TBD
+You will see a letter S infront to the Padre directory as that one is switched.
 
-}}} 
+Now you can edit, test and commit as usual. Your changes will be committed to the branch.
+
+
+When done and you would like to merge your changes
+
+1. Make sure everything is committed
+
+{{{
+$ cd /path/to/padre/Padre
+$ svn switch http://svn.perlide.org/padre/trunk/Padre
+$ svn log --stop-on-copy http://svn.perlide.org/padre/branches/My-branch
+}}}
+
+This will show you the changes you made on the branch. Take the FIRST and LAST revision numbers in this log and
+use the following command to see the full change you made:
+{{{
+svn diff -rFIRST:LAST http://svn.perlide.org/padre/branches/My-branch
+}}}
+
+use the following to merge it back to trunk
+{{{
+svn merge -rFIRST:LAST http://svn.perlide.org/padre/branches/My-branch .
+svn commit -m'merged  -rFIRST:LAST http://svn.perlide.org/padre/branches/My-branch '
+svn rm http://svn.perlide.org/padre/branches/My-branch -m'My-branch is not needed any more'
+}}}
+
+If you decided it was a dead-end you can just switch back to trunk and remove the branch.