public void Sync_BothChangedBinaryFile_FailureReportedOneChosenSingleHead()
{
using (RepositoryWithFilesSetup bob = new RepositoryWithFilesSetup("bob", "test.a9a", "original"))
{
using (RepositoryWithFilesSetup sally = RepositoryWithFilesSetup.CreateByCloning("sally", bob))
{
bob.ReplaceSomething("bobWasHere");
bob.AddAndCheckIn();
sally.ReplaceSomething("sallyWasHere");
//now we have a merge of a file type that don't know how to merge
sally.CheckinAndPullAndMerge(bob);
sally.AssertSingleHead();
bob.AssertSingleHead();
//sally.AssertSingleConflict(c => c.GetType == typeof (UnmergableFileTypeConflict));
sally.AssertSingleConflictType <UnmergableFileTypeConflict>();
// nb: this is sally because the conflict handling mode is (at the time of this test
// writing) set to WeWin.
Assert.That(File.ReadAllText(sally.UserFile.Path), Does.Contain("sallyWasHere"));
}
}
}
public void Sync_BothChangedBinaryFile_FailureReportedOneChosenSingleHead()
{
using (RepositoryWithFilesSetup bob = new RepositoryWithFilesSetup("bob", "test.a9a", "original"))
{
using (RepositoryWithFilesSetup sally = RepositoryWithFilesSetup.CreateByCloning("sally", bob))
{
bob.ReplaceSomething("bobWasHere");
bob.AddAndCheckIn();
sally.ReplaceSomething("sallyWasHere");
//now we have a merge of a file type that don't know how to merge
sally.CheckinAndPullAndMerge(bob);
sally.AssertSingleHead();
bob.AssertSingleHead();
//sally.AssertSingleConflict(c => c.GetType == typeof (UnmergableFileTypeConflict));
sally.AssertSingleConflictType<UnmergableFileTypeConflict>();
// nb: this is sally because the conflict handling mode is (at the time of this test
// writing) set to WeWin.
Assert.IsTrue(File.ReadAllText(sally.UserFile.Path).Contains("sallyWasHere"));
}
}
}
