public void GetAllRevisionss_AfterSyncingTwoTimes_CorrectHistory()
{
Synchronizer setup = new Synchronizer(_project.FolderPath, _project, _progress);
SyncOptions options = new SyncOptions();
options.DoPullFromOthers = false;
options.DoMergeWithOthers = false;
options.CheckinDescription = "first one";
options.DoSendToOthers = false;
setup.SyncNow(options);
File.WriteAllText(_pathToText, "version two of my pretend txt");
options.CheckinDescription = "second one";
setup.SyncNow(options);
List<Revision> items = _repository.GetAllRevisions();
Assert.AreEqual(2, items.Count);
Assert.AreEqual("bob", items[0].UserId);
Assert.AreEqual("second one", items[0].Summary);
Assert.AreEqual("bob", items[1].UserId);
Assert.AreEqual("first one", items[1].Summary);
}
/// <summary>
/// not called "CreateReject*Branch* because we're not naming it (but it is, technically, a branch)
/// </summary>
public void CreateRejectForkAndComeBack()
{
var originalTip = Repository.GetTip();
ChangeFile("test.txt", "bad");
var options = new SyncOptions {DoMergeWithOthers = true, DoPullFromOthers = true, DoSendToOthers = true};
Synchronizer = CreateSynchronizer();
Synchronizer.SyncNow(options);
var badRev = Repository.GetTip();
//notice that we're putting changeset which does the tagging over on the original branch
Repository.RollbackWorkingDirectoryToRevision(originalTip.Number.Hash);
Repository.TagRevision(badRev.Number.Hash, Synchronizer.RejectTagSubstring);// this adds a new changeset
Synchronizer.SyncNow(options);
Revision revision = Repository.GetRevisionWorkingSetIsBasedOn();
revision.EnsureParentRevisionInfo();
Assert.AreEqual(originalTip.Number.LocalRevisionNumber, revision.Parents[0].LocalRevisionNumber, "Should have moved back to original tip.");
}
public SyncResults SyncWithOptions(SyncOptions options, Synchronizer synchronizer)
{
return synchronizer.SyncNow(options);
}
public void ChangeTextFile(Synchronizer sync)
{
SyncOptions options = new SyncOptions();
options.CheckinDescription = "a change to foo.abc";
string bobsFooTextPath = Path.Combine(_lexiconProjectPath, "foo.abc");
File.WriteAllText(bobsFooTextPath, "version two of my pretend txt");
sync.SyncNow(options);
}
