public void CheckoutBranchAfterReadingFileAndVerifyContentsCorrect() { this.ControlGitRepo.Fetch(GitRepoTests.ConflictSourceBranch); this.ControlGitRepo.Fetch(GitRepoTests.ConflictTargetBranch); this.ValidateGitCommand("checkout " + GitRepoTests.ConflictTargetBranch); this.FilesShouldMatchCheckoutOfTargetBranch(); this.ValidateGitCommand("checkout " + GitRepoTests.ConflictSourceBranch); this.FilesShouldMatchCheckoutOfSourceBranch(); // Verify modified paths contents GVFSHelpers.ModifiedPathsContentsShouldEqual(this.Enlistment, this.FileSystem, "A .gitattributes" + GVFSHelpers.ModifiedPathsNewLine); }
public void CheckoutBranchAfterReadingAllFilesAndVerifyContentsCorrect() { this.ControlGitRepo.Fetch(GitRepoTests.ConflictSourceBranch); this.ControlGitRepo.Fetch(GitRepoTests.ConflictTargetBranch); this.ValidateGitCommand("checkout " + GitRepoTests.ConflictTargetBranch); this.Enlistment.RepoRoot.ShouldBeADirectory(this.FileSystem) .WithDeepStructure(this.FileSystem, this.ControlGitRepo.RootPath, compareContent: true, withinPrefixes: this.pathPrefixes); this.ValidateGitCommand("checkout " + GitRepoTests.ConflictSourceBranch); this.Enlistment.RepoRoot.ShouldBeADirectory(this.FileSystem) .WithDeepStructure(this.FileSystem, this.ControlGitRepo.RootPath, compareContent: true, withinPrefixes: this.pathPrefixes); // Verify modified paths contents GVFSHelpers.ModifiedPathsContentsShouldEqual(this.Enlistment, this.FileSystem, "A .gitattributes" + GVFSHelpers.ModifiedPathsNewLine); }