static bool IsSameConflict( MergeSolvedFileConflicts.CurrentConflict currentConflict, IncomingChangeInfo changeInfo) { if (changeInfo == null) { return(false); } return(currentConflict.MountId.Equals(changeInfo.GetMount().Id) && currentConflict.ItemId == changeInfo.GetRevision().ItemId); }
public void CurrentConflictTest() { long itemId = 55; MountPointId mountPointId = MountPointId.WORKSPACE_ROOT; MergeChangeInfo changeInfo = BuildChangeInfo(mountPointId, itemId); MergeSolvedFileConflicts solvedFileConflicts = new MergeSolvedFileConflicts(); MergeSolvedFileConflicts.CurrentConflict currentConflict = new MergeSolvedFileConflicts.CurrentConflict( mountPointId, itemId, 0); solvedFileConflicts.SetCurrentConflict(currentConflict); Assert.IsTrue( IsCurrent.Conflict(changeInfo, null, solvedFileConflicts), "Should return true"); }
public void CurrentConflictWithMetaCurrentIsNotTheMeta() { long itemId = 55; long metaItemId = 66; MountPointId mountPointId = MountPointId.WORKSPACE_ROOT; MergeChangeInfo changeInfo = BuildChangeInfo(mountPointId, itemId); MergeChangeInfo metaChangeInfo = BuildChangeInfo(mountPointId, metaItemId); MergeSolvedFileConflicts solvedFileConflicts = new MergeSolvedFileConflicts(); MergeSolvedFileConflicts.CurrentConflict currentConflict = new MergeSolvedFileConflicts.CurrentConflict( mountPointId, itemId, 0); solvedFileConflicts.SetCurrentConflict(currentConflict); Assert.IsTrue( IsCurrent.Conflict(changeInfo, metaChangeInfo, solvedFileConflicts), "Should return true"); }