Restoring Shelved Changes

To restore shelved changes you merge a personal stream back into a work area. The source stream is the shelved personal stream and the target stream is the stream you are merging into. When restoring you can:

• Select which content to restore.

• Restore to a new, or clean, work area by creating a new workspace and adding stream content to it.

• Restore to a work area associated with a different stream if, for example, the stream used to shelve a work area is locked.

NOTE  The process for restoring shelved changes is the same for merging streams.

1. Do one of the following:

• In Package Explorer right-click a stream or folder and select Team | Merge. The Merge wizard opens. Select Merge streams or their folders and click Next.

To select the shelved personal stream do one of the following:

• Select the Find option, click Find, and use the Select Stream wizard to specify the stream.

• Select the Browse option and select a stream from the Repository Projects tree.

Click Next.

• In Serena Explorer right-click the shelved personal stream and select Merge. The Merge wizard opens.

2. The Merge changes from this stream box displays the ID of the shelved personal stream that will be the source for this merge.

3. A table lists all the Eclipse IDE projects currently in your workspace. These are the projects that you will merge into. To change the scope of the merge do the following:

1. Click Select.

2. Select a projects group from your workspace.

3. Click Next.

4. Select the workspace projects that you want to merge into.

5. Click Finish.

4. To interactively (manually) verify the merge results before applying them to the work area, select Perform an interactive merge.

5. (Optional) Click Advanced.

6. Select these options where applicable:

• Apply the repository date and time to the files in the merge.

• Automatically merge files whose content does not conflict.

• Show a summary of the results of the operation (only available for non-interactive merges).

• Enable logging. Enter the folder path where the log file will be saved or click Browse and select a folder.

Click Next.

7. Select a version of the source stream.

8. To run the merge click Finish. The results of the merge are displayed in the Synchronize view. Use the view to compare revisions, resolve conflicts, and synchronize with the repository.