Beispiel #1
0
 private void TestPass(DecaySpanMergeableAttribute step, DateTime current, MergeActionResult expectedResult = MergeActionResult.Update)
 {
     var action = new MergeAction<DateTime>(MergeKind.ConflictingUpdate, DateTime.MaxValue, current, DateTime.MaxValue);
     step.Merge(action);
     Assert.AreEqual(expectedResult, action.Result);
 }
 /// <summary>
 ///   Initializes a new instance of the <see
 ///   cref="PendingMergeResolution"/> struct.
 /// </summary>
 /// <param name="result">The result.</param>
 /// <param name="commit">The commit.</param>
 public PendingMergeResolution(MergeActionResult result, Action commit)
 {
     _result = result;
     Commit = commit;
 }