Changes between Version 28 and Version 29 of Development


Ignore:
Timestamp:
07/22/09 05:12:02 (5 years ago)
Author:
szabgab
Comment:

instructions for branching

Legend:

Unmodified
Added
Removed
Modified
  • Development

    v28 v29  
    7575= Development in a branch = 
    7676 
    77 Most of our development is done on the trunk but occasionally we prefer to make our private corner for experimental changes. 
    78 Instructions on how to do that 
     77Most of our development is done on the trunk but occasionally we prefer to make our private corner for experimental changes 
     78or changes that might not be stable for some time. 
     79Instructions on how to do that: 
    7980 
     81Create a branch and work on it: 
     82 
     83Assuming you have already checked out http://svn.perlide.org/padre/trunk/ to /path/to/padre 
    8084 
    8185{{{ 
    8286$ svn cp http://svn.perlide.org/padre/trunk/Padre http://svn.perlide.org/padre/branches/My-branch -m'some messages' 
    83 $ cd trunk/Padre 
     87$ cd /path/to/padre/Padre 
    8488$ svn switch http://svn.perlide.org/padre/branches/My-branch . 
    8589}}} 
    8690 
    87 edit, commit as usual 
    88 when done 
     91If you run  
     92{{{ 
     93svn st .. 
     94}}} 
    8995 
    90 TBD 
     96You will see a letter S infront to the Padre directory as that one is switched. 
    9197 
    92 }}}  
     98Now you can edit, test and commit as usual. Your changes will be committed to the branch. 
     99 
     100 
     101When done and you would like to merge your changes 
     102 
     1031. Make sure everything is committed 
     104 
     105{{{ 
     106$ cd /path/to/padre/Padre 
     107$ svn switch http://svn.perlide.org/padre/trunk/Padre 
     108$ svn log --stop-on-copy http://svn.perlide.org/padre/branches/My-branch 
     109}}} 
     110 
     111This will show you the changes you made on the branch. Take the FIRST and LAST revision numbers in this log and 
     112use the following command to see the full change you made: 
     113{{{ 
     114svn diff -rFIRST:LAST http://svn.perlide.org/padre/branches/My-branch 
     115}}} 
     116 
     117use the following to merge it back to trunk 
     118{{{ 
     119svn merge -rFIRST:LAST http://svn.perlide.org/padre/branches/My-branch . 
     120svn commit -m'merged  -rFIRST:LAST http://svn.perlide.org/padre/branches/My-branch ' 
     121svn rm http://svn.perlide.org/padre/branches/My-branch -m'My-branch is not needed any more' 
     122}}} 
     123 
     124If you decided it was a dead-end you can just switch back to trunk and remove the branch.