pegasus/mak/TaskMakefile - diff

Return to TaskMakefile CVS log

Up to [Pegasus] / pegasus / mak

version 1.6, 2006/03/13 16:59:10

version 1.7, 2006/03/13 17:40:20

Line 126

## Tags created/maintained to manage the task branch by the rules within this Makefile

## The [BRANCH NAME] is expected to be PEP number like PEP_XXX or

## The [BRANCH NAME] is expected to be the combination of a PEP number or

## BUG number like BUG_XXXX and functionality based like like

## BUG number and functionality. For example PEPXXXConfigChanges or

## PEP_XXX_Config_Changes or BUG_XXXX_Config_changes.

## BUGXXXXConfigChanges. The branch name should use Camel Notation and

## should not contain underline (_) or dash (-) charecters.

## Note that CVS further restircts this to not use any of the following

## charecters enclosed within []: [$ , . : ; @].

## Branch and branch management tag naming convention

Line 173

Line 176

## this label have been merged into the trunk.

## For Example if the branch name is PEPXX_FUNC then the following tags will

## For Example if the branch name is PEPXXNewFunc then the following tags will

## be in use:

## TASK_PEPXX_FUNC-root

## TASK_PEPXXNewFunc-root

## TASK_PEPXX_FUNC-branch

## TASK_PEPXXNewFunc-branch

## TASK_PEPXX_FUNC-merged_in_to_trunk

## TASK_PEPXXNewFunc-merged_in_to_trunk

## TASK_PEPXX_FUNC-merged_out_from_trunk

## TASK_PEPXXNewFunc-merged_out_from_trunk

## TASK_PEPXX_FUNC-merged_in_from_branch

## TASK_PEPXXNewFunc-merged_in_from_branch

## TASK_PEPXX_FUNC-merged_out_to_branch

## TASK_PEPXXNewFunc-merged_out_to_branch

## Consider the following diagram:

Legend: