Using the Plug-In for Eclipse › Commit Edited Items to the Branch on Latest Trunk

Commit Edited Items to the Branch on Latest Trunk

We recommend that you use the Commit Edited Items to the Branch on Latest Trunk preference when using a branch in the context of the Workspace. This commit preference specifies whether you want to commit branch items to the trunk version of the existing version in the Workspace or to the latest trunk version available in the repository. Depending on whether you always commit your changes to the Workspace trunk version or latest trunk version available in the repository, you can set your commit preference accordingly.

Note: By default this option is selected.

This option behaves as follows when branch is set in the context:

• When the option is selected, the commit operation results in a conflict when any later version exists in the repository. A further commit operation results in creating a branch version on the latest trunk version in repository.
• When you clear this option, the commit operation results in an outgoing change even if any later version exists in the repository.

Example: Commit Branch Items on Latest Trunk Version

The Workspace has version 1 of a file, sample.txt, and the latest trunk version in the repository has version 2 of the same file. The check-in context placement option is on the branch. When you commit the changes, the Synchronization view displays the conflict status of the local and repository versions. Executing a commit operation creates version 2.1.1 of the file as the latest branch version in the repository.

Note: If the check-in placement option is on the trunk, the commit operation warns you that a later version exists. Proceed to reconcile the conflict, mark the status as merged, and commit it. Then, CA Harvest SCM creates version 3 of sample.txt in the repository.

Example: Commit Branch Items on Workspace Trunk Version

The Workspace has the version 1 of a file (sample.txt) and the latest trunk version in the repository has version 2 of the same file. When you commit the changes, the Synchronization view displays the outgoing change. If you perform a commit operation on the outgoing change, CA Harvest SCM creates version 1.1.1 of the file as the branch version in the repository.

Note: If the check-in placement option is on the trunk, the synchronize operation results in a conflict. You must reconcile the conflict, mark it as merged, and then perform the commit operation to create version 3 on the latest trunk version.