|
This article presents a brief branch-and-merge scenario designed to quickly illustrate some branch-and-merge features of Eclipse's CVS support. We assume the reader already appreciates the value of branching and merging in a source control environment.
|
|
An alternative is also described that employs Eclipse's CVS Ongoing Merge support. While the method of this article does not depend upon Ongoing Merge support, it is mentioned in steps where it can utilized.
|
||
|
CVS Merge synchronizations launched using the Team > Merge menu command will appear in the Synchronize view. This view allows you to inspect the differences ...
|
||
|
||
|
||
|
The CVS Merge tool in Eclipse bascially provides support for the same commands you mentioned below. For instance, "cvs update -d -j MP01 -j MP02 *" is accomplished by choosing MP01 as the merge startpoint and MP02 as the end point.
|
||
|
A CVS Merge synchronization will be added to the Synchronize view, showing all differences between your workspace and the branch with the changes. ... Tip: You can perform ongoing merges by pinning a CVS Merge Synchronization in the Synchronize view. This will allow you to keep your workspace up-to-date with the...
|
||
|
The Team > CVS > Update/Merge preferences page contains options which affect the update/merge workflows. ... Here is what the CVS Update/Merge preference page looks like:
|
||
|
Packages that use CVSMergeSubscriber ... Overview Package Class Use Tree Deprecated Index Help ... Eclipse Platform v3.1...
|
||
|
A CVSMergeSubscriber is responsible for maintaining the remote trees for a merge into the workspace. The remote trees represent the CVS revisions of the start and end points (version or branch) of the merge. This subscriber stores the remote handles in the resource tree sync info slot. ... Eclipse Platform v3.1...
|