Changes between Initial Version and Version 1 of explainSvn


Ignore:
Timestamp:
Nov 5, 2012, 9:58:14 AM (12 years ago)
Author:
Yuri Dario
Comment:

How to prepare SVN structure and commit messages.

Legend:

Unmodified
Added
Removed
Modified
  • explainSvn

    v1 v1  
     1This is a simple guide for developers, to allow a common tree structure and commit messages for every package stored into the main repository.
     2
     3First you need to checkout the current ports tree or at least the root directory:
     4{{{
     5svn checkout http://svn.netlabs.org/repos/ports
     6}}}
     7
     8Here is the commit sequence for storing a new port (named xx here):
     9
     10{{{
     11[ports]
     12        mkdir xx\vendor\current.
     13        unpack sources into current.
     14
     15[ports]
     16        svn add xx
     17        svn commit -m "xx: initial vendor import of xx 8.12."
     18
     19[ports\xx\vendor]
     20        svn copy current 8.12
     21        svn commit -m "xx: tag current vendor version."
     22
     23[ports\xx]
     24        svn copy vendor/current trunk
     25        svn commit -m "xx: import current vendor version into trunk."
     26
     27[ports\xx\trunk]
     28        add os2 patches, new files, etc.
     29        svn commit -m "xx: applied os2 patches, added new files, etc etc."
     30
     31}}}
     32
     33Once you have to upgrade then vendor tree to a newer version, first put it in ''current'' tree and tag the version release. Please take note of svn revision for tag operation.
     34
     35To merge changes into the trunk, supposed 318 is the latest revision, use
     36
     37{{{
     38[ports\xx]
     39        svn merge vendor/8.12@318 vendor/8.13@318 trunk
     40        svn commit -m "xx: update trunk to 8.13".
     41}}}