Difference: BranchingGuideLines (1 vs. 2)

Revision 22010/04/12 - Main.ParagMhashilkar

Line: 1 to 1
 
META TOPICPARENT name="GlideinWMS"
Changed:
<
<

CVS Branching Guidelines (DRAFT)

>
>

CVS Branching Guidelines

 

To Branch or Not To Branch

Changed:
<
<
As much as possible, you should create a development branch for your work. Creating a branch may not be needed for every feature change you make. Create a development branch at your discretion. Here are some of the guidelines to make this decision.
>
>
As much as possible, you should create a development branch for your work. Creating a branch may not be needed for every minor change you make. Create a development branch at your discretion. Here are some of the guidelines to make this decision.
 
Added:
>
>
  • Create a Branch when ...
    • Adding new feature(s) to the code
    • There is a possibility of incompatibility
    • Multiple developers are working on the feature(s) in collaborative manner
 

Branching and Merging Tips

  • Tag the code before forking off a branch
Changed:
<
<
  • Create the branch
>
>
  • Create the branch with the branch name that can be easily associated with you
 
  • Make your changes, test them
  • Only when you are convinced that your changes are tested and working, merge them back to the respective version and/or head.
Added:
>
>
  • Remember to update the tags.txt file
 
  • Test the changes after doing the merge to make sure you do not break anything or create incompatibility.

-- ParagMhashilkar - 2010/03/30

Revision 12010/03/30 - Main.ParagMhashilkar

Line: 1 to 1
Added:
>
>
META TOPICPARENT name="GlideinWMS"

CVS Branching Guidelines (DRAFT)

To Branch or Not To Branch

As much as possible, you should create a development branch for your work. Creating a branch may not be needed for every feature change you make. Create a development branch at your discretion. Here are some of the guidelines to make this decision.

Branching and Merging Tips

  • Tag the code before forking off a branch
  • Create the branch
  • Make your changes, test them
  • Only when you are convinced that your changes are tested and working, merge them back to the respective version and/or head.
  • Test the changes after doing the merge to make sure you do not break anything or create incompatibility.

-- ParagMhashilkar - 2010/03/30

 
This site is powered by the TWiki collaboration platformCopyright © by the contributing authors. All material on this collaboration platform is the property of the contributing authors.
Ideas, requests, problems regarding TWiki? Send feedback