Change Sets Work List | Cherry Pick

Overview:The Change Set Work List is a list with change sets ordered in chronological order, the list is created by analyzing the change sets checked in to one branch with the change sets merged to another branch.

This is useful when merging is done from for example the Development branch to the Main branch. Change sets in the development branch already merged will be excluded from the list, Forward Integrations from the Main branch is also excluded from the list.

The list is created and decided by the project, the lead developer and project managers decide in a follow up meeting what to merge. If a ‘Cherry Pick’ is to be done, this must be analyzed to eliminate the consequences of possible merge conflicts and so on. All this is done in the DevMethod Tool, the developer responsible for the merge opens the list from Visual Studio and process the changes sets from top to bottom.

Functionality of Work List Buttons:The work list features three buttons above the grid, aiding in linking change sets to work items and annotating check-in comments

The 3 buttons on top of the grid to help you relate the change set to the work items and set a check in comment that will relate the new change set to the original change set.

The buttons have these functions.

  1. Add the work items related to the original change set.
  2. Insert a check in comment that is linking the new change set to the original change set and referring to the original work items.
  3. Create a full check in comment if there is no project related to the change set.

Additionally, four buttons on the right side of the grid provide these functions:

  1. Find and select a work list.
  2. Check all the details on the change set, all work items are available and can be opened.
  3. Create a full check in comment if there is no project related to the change set.
  4. Sign off the merge work, this is to be done when all changes are merged.
  5. Create a “Delivery Note”, this will create a wiki page in the DevOps project with the change sets merged and the related work items.

Merging Process:

  1. Preparation:Confirm connection to the correct repo and project in Team Explorer.
  2. Accessing the Work List:Navigate to View >Other Windows >DevMethod - Change Sets Work Listin Visual Studio. Dock the window as preferred.
  3. Selecting Work List:Click the Find Work Listbutton on the right side of the grid. Choose an unmerged list (with unchecked merged box) and the branch you are merging from.
  4. Merge the change set:Merge the code and the project, check the check mark that the code is merged. Open the project that is merged.
  5. Open the project:Open the merged project, check that the correct Visual Studio project is selected in the selection combo box.
  6. Add the releated work items:Click the first button on top of the list to add the related work items.
  7. Add the check in comment:Click the second button on top of the list to add a valid check in comment.

Remember, there's no need to use the verify button as the work items are likely closed and may not provide relevant information.

Build the project and check in the code when done. Repeat until all changes are merged. When you are done, open the sign off dialog by clicking the signoff button.

Sign off your work.

Fill in a comment in the text box, close the dialog. Then publish the “Delivery Note” by clicking the Publish Delivery Note button.

Create and publish the delivery note.

This button will create the delivery not, the list of merged change sets.