//this one is only for deserializing
private MergeSituation(string relativePathToFile, MergeOrder.ConflictHandlingModeChoices conflictHandlingMode)
{
ConflictHandlingMode = conflictHandlingMode;
if (relativePathToFile != null)
{
relativePathToFile = relativePathToFile.Trim(new[] { Path.DirectorySeparatorChar });
}
PathToFileInRepository = relativePathToFile;
}
public MergeSituation(string relativePathToFile, string firstUserId, string firstUserRevision, string secondUserId, string secondRevision, MergeOrder.ConflictHandlingModeChoices conflictHandlingMode)
: this(relativePathToFile, conflictHandlingMode)
{
switch (conflictHandlingMode)
{
case MergeOrder.ConflictHandlingModeChoices.TheyWin:
AlphaUserId = secondUserId;
BetaUserId = firstUserId;
BetaUserRevision = firstUserRevision;
AlphaUserRevision = secondRevision;
break;
default:
AlphaUserId = firstUserId;
BetaUserId = secondUserId;
BetaUserRevision = secondRevision;
AlphaUserRevision = firstUserRevision;
break;
}
//we don't have access to this yet: AncestorRevision = ancestorRevision;
}
