MSF for Agile Software Development Visual Studio 2005 Team System logo

Activity:

Integrate Code Changes

Participating Roles

Responsible:

Developer

Overview

Entry Criteria

    Dependencies:

    • The set of changes for a development task has been unit tested, reviewed, and undergone code analysis.
    • All of the system unit tests run successfully.

    Sub-Activities

    1

    Check Dependencies

    • If the task depends on any other tasks that have not been checked in, wait until those development tasks have been integrated.
    • If the development task is mutually dependent on another, shelve one of them and retrieve it on the same machine as the other. Handle the two as a single development task but check the work in against both tasks.
    • Synchronize with the latest versions of the code for the area in which the code changed.

    2

    Test and Integrate Other Development Tasks

    • Test to be sure the fix for the bug or the part of the scenario or quality of service requirement works with related changes already integrated. 
    • Run the unit tests to be sure that the set of changes is compatible with those already integrated.
    • Debug the integration if necessary, run unit tests, and perform code analysis.

    3

    Check In the Set of Changes

    • Set the next build number in 'resolved in build field' for a bug or the 'integration build' field for a development task. 
    • Check in the code changes and the unit tests with the bug or development task. Associate the shelveset with the work item if it is only partially fixed or completed. Otherwise, choose resolve for bugs and close for development tasks. This should close the development task or resolve the bug and create a new changeset linked to the work item.

    4

    Resolve Work Item

    • If the work item associated with the changes is a scenario or quality of service requirement and you are not the owner, notify the owner that the changes are complete.
    • If you are the owner of the scenario or quality of service requirement, test the entire integration and attach the test case that runs through the scenario to the scenario or quality of service requirement work item. Attach the test results to the scenario. Set the 'integration build' field to the next build.
    • Set the associated work item to Resolved and assign the scenario to one of the testers who created the test cases for the work item. Reassign the tester as the new work item owner.

    Exit Criteria

    A new changeset is created and ready for integration into the build.

    If this is the last set of changes needed to implement the scenario or quality of service requirement or to fix a bug, the built system now exhibits the behavior called for in the work item. A test is checked in which tests this behavior. The scenario, quality of service requirement, or bug associated with this work is resolved. Any development tasks are closed.

    © 2006 Microsoft Corporation. All rights reserved.

    Version 4.1.0