com.microsoft.tfs.core.clients.versioncontrol
Class PropertiesMergeSummary

java.lang.Object
  extended by com.microsoft.tfs.core.clients.versioncontrol.PropertiesMergeSummary

public class PropertiesMergeSummary
extends java.lang.Object


Method Summary
static PropertiesMergeSummary calculateSummary(PropertyValue[] baseProperties, PropertyValue[] yourProperties, PropertyValue[] theirProperties)
          Calculates the merge summary based on the provided properties.
 PropertyValue[] getMergedProperties()
           
 int getTotalConflicts()
           
 int getTotalTheirChanges()
           
 int getTotalYourChanges()
           
 boolean isRedundant()
           
 void setMergedProperties(PropertyValue[] mergedProperties)
           
 
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
 

Method Detail

getTotalConflicts

public int getTotalConflicts()

getTotalTheirChanges

public int getTotalTheirChanges()

getTotalYourChanges

public int getTotalYourChanges()

isRedundant

public boolean isRedundant()

getMergedProperties

public PropertyValue[] getMergedProperties()

setMergedProperties

public void setMergedProperties(PropertyValue[] mergedProperties)

calculateSummary

public static PropertiesMergeSummary calculateSummary(PropertyValue[] baseProperties,
                                                      PropertyValue[] yourProperties,
                                                      PropertyValue[] theirProperties)
Calculates the merge summary based on the provided properties.

Parameters:
baseProperties -
yourProperties -
theirProperties -
Returns:


© 2015 Microsoft. All rights reserved.