Changes between Version 5 and Version 6 of Obsolete/Development/Templates/RepUpdate


Ignore:
Timestamp:
Sep 13, 2006, 2:40:57 PM (18 years ago)
Author:
/C=FR/O=CNRS/OU=UMR8607/CN=Michel Jouvin/emailAddress=jouvin@…
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • Obsolete/Development/Templates/RepUpdate

    v5 v6  
    66Normal development process for templates is to develop templates in a Quattor configuration database, where you can deploy the new templates in a real (test or production) environment. Only after, you have validated the modification in your environment, you should update the QWG repository.
    77
    8 New or modified templates '''should always''' been committed to the QWG [source:templates/trunk repository trunk] first, never directly in a [source:templates/branches branch] or [source:templates/tags tag].
     8New or modified templates '''should always''' be committed to the QWG [source:templates/trunk repository trunk] first, never directly in a [source:templates/branches branch] or [source:templates/tags tag].
     9
     10As much as possible, there should be one commit by elementary change. Avoid huge commit implementing many unrelated changes are they are more difficult to track and to revert. Also take care of putting useful commit message for each commit.
     11
     12== Merging change from a production SCDB ==
    913
    1014It is quite important not to break the history when a template is moved from one location to another or removed. And the trunk is not a direct copy of a real repository. To help updating the trunk from a real Quattor configuration database, you should use [source:templates/trunk/tools/directory-sync directory-sync] tool. '''This tool must be run from a local workspace of QWG [source:templates/trunk repository trunk]'''. This tool updates a trunk directory with the contents of a specified source, doing the following :
    … …  
    4044When there is no more templates flagged as `!` (missing) or `?` (unknown), you can commit your changes to the repository. Please, take care of setting up a useful message for the commit as this is the only source for a ChangeLog...
    4145
    42 After committing your changes, if you think they are worth a new 'release', refer to the documentation about [wiki:Development/RelTagging] tagging] a new release.
    4346
     47== Tagging a new release ==
     48
     49After committing your changes, if you think they are worth a new 'release' or are ready for insertion into a specific branch, refer to the documentation about [wiki:Development/RelTagging] tagging] a new release.
     50