public void Sync_ExistingRejectChangeSet_NotMergedIn()
{
using (var bob = new RepositorySetup("bob"))
{
bob.AddAndCheckinFile("test.txt", "original");
bob.CreateRejectForkAndComeBack();
bob.ChangeFileAndCommit("test.txt", "ok", "goodGuy"); //move on so we have two distinct branches
bob.AssertHeadCount(2);
bob.CheckinAndPullAndMerge(null);
Assert.AreEqual("goodGuy", bob.Repository.GetRevisionWorkingSetIsBasedOn().Summary);
bob.AssertLocalRevisionNumber(3);
bob.AssertHeadCount(2);
}
}
