Changes between Version 13 and Version 14 of DRM4G/Development


Ignore:
Timestamp:
Dec 12, 2016 1:14:00 PM (5 years ago)
Author:
minondoa
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DRM4G/Development

    v13 v14  
    163163The '''feature branches''' are how new functionalities are introduced and [wiki:DRM4G/Development#TestingtheDRM4G tested]. Normally the finalization of one of them will also define when a new release will be published, but that's not always the case since a new release may include more than one new feature.
    164164
    165 * As for the naming convention for these branches, they can be anything separated by hyphens ("'''-'''"), but always adding the prefix "'''DRM4G-'''".
     165* As for the naming convention for these branches, they can be anything separated by hyphens ("'''-'''"), but always adding the prefix "'''drm4g-'''".
    166166 * However the name should try to be describe what is being implemented with it.
    167167
    168168{{{#!sh
    169169git checkout develop
    170 git checkout -b DRM4G-new-feature #it will switch you to the new branch
     170git checkout -b drm4g-new-feature #it will switch you to the new branch
    171171}}}
    172172
     
    180180{{{#!sh
    181181git checkout develop
    182 git merge --no-ff DRM4G-new-feature
    183 git branch -d DRM4G-new-feature
     182git merge --no-ff drm4g-new-feature
     183git branch -d drm4g-new-feature
    184184git push origin develop
    185185git push github develop
     
    202202
    203203From this point on, all the following changes done on the '''develop''' branch will be for the following release. So, to avoid halting the development of the project a new '''__release branch__''' is created indicating the new release number.
    204 * The nomenclature for all '''release branches''' will be a string followed by the new version in numbers in the form of '''__DRM4G-MAJOR.MINOR.PATCH__''' and they will have their numbers increase following these guidelines:
     204* The nomenclature for all '''release branches''' will be a string followed by the new version in numbers in the form of '''__drm4g-MAJOR.MINOR.PATCH__''' and they will have their numbers increase following these guidelines:
    205205 *   '''MAJOR''' version when you add some new functionality or you make incompatible API changes
    206206 *   '''MINOR''' version when you improve some part of the DRM4G's functionality in a backwards-compatible manner
    207207 *   '''PATCH''' version when you make backwards-compatible bug fixes.
    208 * For creating '''tags''', the same naming convention will be followed, albeit just the digits will be used.
     208* __For creating '''tags'''__, the same naming convention will be followed, albeit just the digits will be used.
    209209
    210210It is in this branch where the version number of all the files will be modified, and where the code will be brought to a release ready state. That means that it is where minor bug fixes will be made, where comments and unnecessary code snippets will be removed and other maintenance tasks will be carried out.
     
    215215{{{#!sh
    216216git checkout master
    217 git merge --squash DRM4G-X.X.X
     217git merge --squash drm4g-X.X.X
    218218git commit -v
    219219git tag X.X.X
     
    230230{{{#!sh
    231231git checkout develop
    232 git merge --no-ff DRM4G-X.X.X
     232git merge --no-ff drm4g-X.X.X
    233233git tag X.X.X
    234234git push origin develop
     
    240240Aferwards you can just delete the '''release branch'''.
    241241{{{#!sh
    242 git branch -d DRM4G-X.X.X
     242git branch -d drm4g-X.X.X
    243243}}}
    244244