Change Management within a View

Undoubtedly, your most active views will be activity and sandbox views. But, unless you’ve figured out how to write defect-free software, you’ll also need to make changes to release views. And, although we don’t recommend it as a general practice, for small changes, it often makes sense to perform updates directly in the main view. In all of these cases, your team has several choices for the process by which they perform updates.

The appropriate process depends on the size of your development team (which affects the probability of conflicts) and the level of detail with which you need to track changes. So, let’s first review the ways in which changes are documented, tracked, and queried in StarTeam:

Now that we’ve looked at the primary means by which you can report on changes within a view, let’s look at ways in which you can manage change. We’ll do this by examining three scenarios in increasing order of “formality”.

Scenario 1: Working in a Small Team

If you’re working on a project managed by a small team, you may not need much formal change management. Furthermore, if code modules are clearly assigned to individuals, or if you can just lean out your office door and yell, “Hey, I’m working on the report module”, then the possibility for conflicts may be very low . In this case, your change process may be very simple:

  • Maintain a set of local working folders where you keep the latest files for each view.
  • Before you begin a new development task, get your working folders up-to-date by checking out any “Missing” or “Out of Date” files.
  • As you modify files in your working folders, you’ll see their status in the File tab become Modified. New files will appear as Not in View because they have not been added to the view yet. New folders will appear as Not in View in the Folder tab. If you enable Show Not-In-View Folders in the Folder Tree menu, you’ll see not-in-view folders in the folder tree regardless of which tab is selected. The folder tree always shows Current folders and those Missing from your workspace.
  • When you’re ready to check-in, refresh your window (if you don’t have automatic refresh turned on) to see if another developer added or modified anything that may affect you. Check-out any new Missing or Out of Date files.
  • If another developer checked in a file that you modified locally, its status will become Merge. The best way to resolve the merge conflict is to check out the file and answer Yes to the Do you want to merge prompt. This will launch the File Compare Merge tool. If there are no conflicts, the merge tool usually just saves the merged result file over your existing work file. Otherwise, you may be prompted to review and tweak the result file before continuing. Once saved, the file’s status will change to Modified.
  • When you have only Not in View and Modified files, to do a build, run unit tests, and/or do any other validation steps your team requires.
  • Finally, commit your changes to the view. You can select all of the new (Not in View) and modified files and check them all in at once. If you add/check-in multiple files in a single step, they are committed as an atomic transaction. Moreover, file content is pushed to the server “outside” of transaction state in a restartable manner. So, if you cancel a large multi-file add/check-in operation before it commits, you can restart it by just doing it again, only files that didn’t make it in the first attempt will be sent to the StarTeam Server. The commit happens at the end only when all content has arrived using a single transaction.
Note: One caveat of adding new files and checking-in modified files in the same check-in dialog is that the revision comment is also used to initialize the Description property of new files. If you want accurate descriptions for new files, add each one separately or modify each file’s description after adding it. New folders are added automatically, you only need to explicitly add new folders on the server when they are empty on the client.

And that’s it. You get revision history and audit records automatically. This process doesn’t fool with labels, and you don’t get process item links either. But it might be all that your organization needs.

Scenario 2: Preventing Merge Conflicts

As your team size grows, the problem you may find with the previous scenario is encountering too many unexpected merge conflicts. Your team may want everyone to know when you’re about to make changes to a file before you actually do so. To better communicate intent and reduce the likelihood of merge conflicts, you can amend the process outlined in the previous scenario as follows:

  • In the Personal Options dialog box, select the options Mark unlocked working files as read-only and Clear file locks on check-in.
  • When you want to edit a file, lock it via the StarTeam Cross-Platform Client first.
  • When you check-in modified files, the tools will automatically unlock them for you (in the same transaction in which the changes are committed).

This process both informs team members of who is working on what, and it minimizes merge conflicts. Note that your team can require this process by setting the project-level options Require exclusive lock when files are checked-in and Mark unlocked files read-only. It’s up to you and your team to decide if you want this level of enforcement.

Scenario 3: Using Process Items

The next step in a more formal intra-view change management practice is to use process items so that all file modifications are linked to an appropriate change item. You can enforce the use of process items at the project level using the Process Rules options. These options let you:

  • Require the selection of a process item when new files are added or modified files are checked in.
  • Select which item types are eligible as process items. Your choices are change requests, tasks, and requirements.
  • Specify whether or not the Status of each item type will be considered in order to be used as a process item and which status values are permitted. For example, you can specify that change requests must have a status of Open, but tasks can be used regardless of status.

When you enforce process items, existing files cannot be modified and new files cannot be added until an eligible process item is selected. Consequently, new and modified files are automatically linked to the selected process item, enhancing the context information of these changes. Moreover, the links are created in the same atomic transaction in which the file updates are performed.

Note: In the add and check-in dialogs, you can elect to mark the selected process item Closed (change requests), Finished (requirements), or Complete (tasks). If you choose this option, the process item update is also performed in the same atomic transaction.
Parent topic: View Configuration and Management