com.starteam
Class MergePoint

java.lang.Object
  com.starteam.MergePoint

public final class MergePoint
extends java.lang.Object

This class provides information about how two item revisions are related with respect to merging. Suppose the file "foo.txt" branches at revision 1.3 to create a new revision 1.3.1.0. A checkin on the main branch will create revision 1.4 and a subsequent checkin on the alternate branch will create revision 1.3.1.1. If the user then merges the changes between 1.3 to 1.4 in to a new branch revision 1.3.1.2 a MergePoint can be used to record the sources used to create this new revision. In this case the MergePoint would have a source Revision corresponding to the 1.4 revision of "foo.txt" and a target Revision corresponding to the 1.3.1.2 revision of "foo.txt".

See Also:

Item.resolveMergePoint(com.starteam.Item), Item.recordMergePoint(com.starteam.Item)

Nested Class Summary

static class

MergePoint.Revision A simple class representing a unique revision of an Item in the repository.

Method Summary

MergePoint.Revision	getSource() Returns the Revision of the merge source.
MergePoint.Revision	getTarget() Returns the Revision of the merge target.

Methods inherited from class java.lang.Object

equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Method Detail

getSource

public MergePoint.Revision getSource()

Returns the Revision of the merge source.

Returns:

the Revision of the merge source.

getTarget

public MergePoint.Revision getTarget()

Returns the Revision of the merge target.

Returns:

the Revision of the merge target.