Bookshelf Home | Contents | Index | Search | PDF

Siebel Analytics Server Administration Guide > Completing Setup and Managing Repository Files > Making Changes in an Analytics Multiuser Development Environment >

Merging Metadata Changes Into the Source Repository

---

After changing and testing the metadata, the developer initiates a merge of the metadata changes into the source repository. The Administration Tool automatically copies the current version of the source repository from the shared multiuser directory to the \\SiebelAnalytics\Repository directory on the developer's machine and updates the log files in the local and multiuser development directories. This is necessary because the source repository in the shared multiuser directory might have changed after the developer checked out the projects.

The merge process is a three-way merge involving the following files:

• Source repository. This may have been modified by other developers before this merge.
• Modified local (subset) repository. Contains the projects modified by the developer.
• Original copy of the local (subset) repository. Contains the state of the projects as originally extracted. This repository name begins with Original. An example of the file name for this copy might be OriginalDevelopment2.rpd.

Only one developer at a time can merge metadata from a local repository into the source repository. When the check-in process begins, the Administration Tool determines if the source repository is currently locked. If not, it locks the source repository, preventing other developers from performing a merge until the current merge is complete, and records the lock in the log file. For other developers, the Multi-User Checkin option on the File menu will be unavailable until the in-process merge is complete.

Multiuser Development Merge Logic

The multiuser development checkin process uses the same technology as the standard repository merge but with several important differences. For more information about the standard repository merge, see Merging Siebel Analytics Repositories. The following is a list of the way in which the multiuser development merge is different from the standard repository merge:

• Inserts are applied automatically. Because a subset of the source repository is being used as the original repository, most objects in the source repository appear to be new. This would result in many unnecessary prompts that the developer would have to manually approve. Therefore, inserts are applied without a prompt during a multiuser development merge.
• Conflicts that are not inserts but are resolved as a result of the automatic inserts are applied without a prompt during a multiuser development merge.
• The database and connection pool properties on the server take precedence over the same properties on the developer's machine. This precedence are applied without a prompt during a multiuser development merge.

To merge metadata changes into the source repository

1. From the Administration Tool menu, choose File > Multi-User Checkin.
2. In the Merge repositories dialog box, verify that the Original repository and Modified repository file names are correct.

   The center pane contains conflict resolution information.

3. In the center pane, make the choices required to resolve any conflicts.
4. Click Merge and save the repository.

Bookshelf Home | Contents | Index | Search | PDF