本文整理汇总了C#中EmptyRepositoryFixture.MergeNoFF方法的典型用法代码示例。如果您正苦于以下问题：C# EmptyRepositoryFixture.MergeNoFF方法的具体用法？C# EmptyRepositoryFixture.MergeNoFF怎么用？C# EmptyRepositoryFixture.MergeNoFF使用的例子？那么恭喜您, 这里精选的方法代码示例或许可以为您提供帮助。您也可以进一步了解该方法所在类EmptyRepositoryFixture的用法示例。
在下文中一共展示了EmptyRepositoryFixture.MergeNoFF方法的15个代码示例，这些例子默认根据受欢迎程度排序。您可以为喜欢或者感觉有用的代码点赞，您的评价将有助于系统推荐出更棒的C#代码示例。
示例1: GitFlowPullRequestBranch
public void GitFlowPullRequestBranch()
{
using (var fixture = new EmptyRepositoryFixture(new Config()))
{
fixture.Participant("master");
fixture.Participant("develop");
// GitFlow setup
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.2.0");
fixture.BranchTo("develop");
// Branch to develop
fixture.MakeACommit();
fixture.AssertFullSemver("1.3.0-unstable.1");
// Open Pull Request
fixture.BranchTo("pull/2/merge", "pr");
fixture.Activate("pull/2/merge");
fixture.AssertFullSemver("1.3.0-PullRequest.2+1");
fixture.MakeACommit();
fixture.AssertFullSemver("1.3.0-PullRequest.2+2");
// Merge into develop
fixture.Checkout("develop");
fixture.MergeNoFF("pull/2/merge");
fixture.Destroy("pull/2/merge");
fixture.NoteOver("Feature branches/pr's should\r\n" +
"be deleted once merged", "pull/2/merge");
fixture.AssertFullSemver("1.3.0-unstable.3");
}
}示例2: NormalisationOfTag
public void NormalisationOfTag()
{
using (var fixture = new EmptyRepositoryFixture(new Config()))
{
fixture.Repository.MakeACommit();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/foo"));
fixture.Repository.MakeACommit();
fixture.BranchTo("release/2.0.0");
fixture.MakeACommit();
fixture.MakeATaggedCommit("2.0.0-rc.1");
fixture.Checkout("master");
fixture.MergeNoFF("release/2.0.0");
fixture.Repository.Branches.Remove(fixture.Repository.FindBranch("release/2.0.0"));
var remoteTagSha = fixture.Repository.Tags["2.0.0-rc.1"].Target.Sha;
using (var localFixture = fixture.CloneRepository())
{
localFixture.Checkout(remoteTagSha);
GitHelper.NormalizeGitDirectory(localFixture.RepositoryPath, new Authentication(), noFetch: false, currentBranch: string.Empty);
localFixture.AssertFullSemver("2.0.0-rc.1");
}
}
}示例3: GitFlowFeatureBranch
public void GitFlowFeatureBranch()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.SequenceDiagram.Participant("master");
fixture.SequenceDiagram.Participant("develop");
// GitFlow setup
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.2.0");
fixture.BranchTo("develop");
// Branch to develop
fixture.MakeACommit();
fixture.AssertFullSemver("1.3.0-unstable.1");
// Open Pull Request
fixture.BranchTo("feature/myfeature", "feature");
fixture.SequenceDiagram.Activate("feature/myfeature");
fixture.AssertFullSemver("1.3.0-myfeature.1+1");
fixture.MakeACommit();
fixture.AssertFullSemver("1.3.0-myfeature.1+2");
// Merge into develop
fixture.Checkout("develop");
fixture.MergeNoFF("feature/myfeature");
fixture.SequenceDiagram.Destroy("feature/myfeature");
fixture.SequenceDiagram.NoteOver("Feature branches should\r\n" +
"be deleted once merged", "feature/myfeature");
fixture.AssertFullSemver("1.3.0-unstable.3");
}
}示例4: GitFlowHotfixBranch
public void GitFlowHotfixBranch()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.SequenceDiagram.Participant("develop");
fixture.SequenceDiagram.Participant("master");
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.2.0");
// Create hotfix branch
fixture.Checkout("master");
fixture.BranchTo("hotfix/1.2.1", "hotfix");
fixture.SequenceDiagram.Activate("hotfix/1.2.1");
fixture.MakeACommit();
fixture.MakeACommit();
fixture.AssertFullSemver("1.2.1-beta.1+2");
// Apply beta.1 tag should be exact tag
fixture.ApplyTag("1.2.1-beta.1");
fixture.AssertFullSemver("1.2.1-beta.1");
fixture.Checkout("master");
fixture.MergeNoFF("hotfix/1.2.1");
fixture.SequenceDiagram.Destroy("hotfix/1.2.1");
fixture.SequenceDiagram.NoteOver("Hotfix branches are deleted once merged", "hotfix/1.2.1");
fixture.ApplyTag("1.2.1");
}
}示例5: NormalisationOfTag
public void NormalisationOfTag()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.Repository.MakeACommit();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/foo"));
fixture.Repository.MakeACommit();
fixture.BranchTo("release/2.0.0");
fixture.MakeACommit();
fixture.MakeATaggedCommit("2.0.0-rc.1");
fixture.Checkout("master");
fixture.MergeNoFF("release/2.0.0");
fixture.Repository.Branches.Remove(fixture.Repository.Branches["release/2.0.0"]);
var remoteTagSha = fixture.Repository.Tags["2.0.0-rc.1"].Target.Sha;
using (var localFixture = fixture.CloneRepository())
{
localFixture.Checkout(remoteTagSha);
GitRepositoryHelper.NormalizeGitDirectory(localFixture.RepositoryPath, new AuthenticationInfo(), noFetch: false, currentBranch: string.Empty);
localFixture.Repository.Head.FriendlyName.ShouldBe("(no branch)");
localFixture.Repository.Head.Tip.Sha.ShouldBe(remoteTagSha);
}
}
}示例6: GitFlowPullRequestBranch
public void GitFlowPullRequestBranch()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.SequenceDiagram.Participant("master");
fixture.SequenceDiagram.Participant("develop");
// GitFlow setup
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.2.0");
fixture.BranchTo("develop");
// Branch to develop
fixture.MakeACommit();
fixture.AssertFullSemver("1.3.0-alpha.1");
// Open Pull Request
fixture.BranchTo("pull/2/merge", "pr");
fixture.SequenceDiagram.Activate("pull/2/merge");
fixture.AssertFullSemver("1.3.0-PullRequest0002.1");
fixture.MakeACommit();
fixture.AssertFullSemver("1.3.0-PullRequest0002.2");
// Merge into develop
fixture.Checkout("develop");
fixture.MergeNoFF("pull/2/merge");
fixture.SequenceDiagram.Destroy("pull/2/merge");
fixture.SequenceDiagram.NoteOver("Feature branches/pr's should\r\n" +
"be deleted once merged", "pull/2/merge");
fixture.AssertFullSemver("1.3.0-alpha.3");
Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
}
}示例7: TheReadmeSample
public void TheReadmeSample()
{
using (LogHelper.Capture(_outputHelper, LogProvider.SetCurrentLogProvider))
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.MakeACommit();
fixture.MakeACommit();
fixture.MakeATaggedCommit("1.0.0");
fixture.BranchTo("develop");
fixture.MakeACommit();
fixture.Checkout("master");
fixture.MergeNoFF("develop");
}
}
}示例8: InheritVersionFromReleaseBranch
public void InheritVersionFromReleaseBranch()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.MakeATaggedCommit("1.0.0");
fixture.BranchTo("develop");
fixture.MakeACommit();
fixture.BranchTo("release/2.0.0");
fixture.MakeACommit();
fixture.MakeACommit();
fixture.Checkout("develop");
fixture.AssertFullSemver("1.1.0-alpha.1");
fixture.MakeACommit();
fixture.AssertFullSemver("2.1.0-alpha.1");
fixture.MergeNoFF("release/2.0.0");
fixture.AssertFullSemver("2.1.0-alpha.4");
fixture.BranchTo("feature/MyFeature");
fixture.MakeACommit();
fixture.AssertFullSemver("2.1.0-MyFeature.1+3");
}
}示例9: GitHubFlowMajorRelease
public void GitHubFlowMajorRelease()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.SequenceDiagram.Participant("master");
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.3.0");
// Create release branch
fixture.BranchTo("release/2.0.0", "release");
fixture.SequenceDiagram.Activate("release/2.0.0");
fixture.MakeACommit();
fixture.AssertFullSemver("2.0.0-beta.1+1");
fixture.MakeACommit();
fixture.AssertFullSemver("2.0.0-beta.1+2");
// Apply beta.1 tag should be exact tag
fixture.ApplyTag("2.0.0-beta.1");
fixture.AssertFullSemver("2.0.0-beta.1");
// test that the CommitsSinceVersionSource should still return commit count
var version = fixture.GetVersion(new Config());
version.CommitsSinceVersionSource.ShouldBe("2");
// Make a commit after a tag should bump up the beta
fixture.MakeACommit();
fixture.AssertFullSemver("2.0.0-beta.2+3");
// Complete release
fixture.Checkout("master");
fixture.MergeNoFF("release/2.0.0");
fixture.SequenceDiagram.Destroy("release/2.0.0");
fixture.SequenceDiagram.NoteOver("Release branches are deleted once merged", "release/2.0.0");
fixture.AssertFullSemver("2.0.0+0");
fixture.ApplyTag("2.0.0");
fixture.AssertFullSemver("2.0.0");
fixture.MakeACommit();
fixture.Repository.DumpGraph();
fixture.AssertFullSemver("2.0.1+1");
}
}示例10: GitFlowSupportMinorRelease
public void GitFlowSupportMinorRelease()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.SequenceDiagram.Participant("develop");
fixture.SequenceDiagram.Participant("master");
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.3.0");
// GitFlow setup
fixture.Repository.MakeACommit();
fixture.BranchTo("develop");
fixture.SequenceDiagram.NoteOver("Create 2.0.0 release and complete", "develop", "master");
fixture.Checkout("master");
fixture.ApplyTag("2.0.0");
// Create hotfix branch
fixture.Checkout("1.3.0");
fixture.BranchToFromTag("support/1.x", "1.3.0", "master", "support");
fixture.SequenceDiagram.NoteOver("Create 1.3.1 release and complete", "master", "support/1.x");
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.3.1");
fixture.BranchTo("release/1.4.0", "supportRelease");
fixture.SequenceDiagram.Activate("release/1.4.0");
fixture.MakeACommit();
fixture.MakeACommit();
fixture.AssertFullSemver("1.4.0-beta.1+2");
// Apply beta.1 tag should be exact tag
fixture.ApplyTag("1.4.0-beta.1");
fixture.AssertFullSemver("1.4.0-beta.1");
fixture.Checkout("support/1.x");
fixture.MergeNoFF("release/1.4.0");
fixture.SequenceDiagram.Destroy("release/1.4.0");
fixture.SequenceDiagram.NoteOver("Release branches are deleted once merged", "release/1.4.0");
fixture.AssertFullSemver("1.4.0+0");
fixture.ApplyTag("1.4.0");
fixture.AssertFullSemver("1.4.0");
}
}示例11: GitHubFlowMajorRelease
public void GitHubFlowMajorRelease()
{
using (var fixture = new EmptyRepositoryFixture(new Config()))
{
fixture.Participant("master");
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.3.0");
// Create release branch
fixture.BranchTo("release/2.0.0", "release");
fixture.Activate("release/2.0.0");
fixture.MakeACommit();
fixture.AssertFullSemver("2.0.0-beta.1+1");
fixture.MakeACommit();
fixture.AssertFullSemver("2.0.0-beta.1+2");
// Apply beta.1 tag should be exact tag
fixture.ApplyTag("2.0.0-beta.1");
fixture.AssertFullSemver("2.0.0-beta.1");
// Make a commit after a tag should bump up the beta
fixture.MakeACommit();
fixture.AssertFullSemver("2.0.0-beta.2+3");
// Complete release
fixture.Checkout("master");
fixture.MergeNoFF("release/2.0.0");
fixture.Destroy("release/2.0.0");
fixture.NoteOver("Release branches are deleted once merged", "release/2.0.0");
fixture.AssertFullSemver("2.0.0+0");
fixture.ApplyTag("2.0.0");
fixture.AssertFullSemver("2.0.0");
fixture.MakeACommit();
fixture.Repository.DumpGraph();
fixture.AssertFullSemver("2.0.1+1");
}
}示例12: GitFlowSupportHotfixRelease
public void GitFlowSupportHotfixRelease()
{
using (var fixture = new EmptyRepositoryFixture(new Config()))
{
fixture.Participant("develop");
fixture.Participant("master");
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.3.0");
// GitFlow setup
fixture.Repository.MakeACommit();
fixture.BranchTo("develop");
fixture.NoteOver("Create 2.0.0 release and complete", "develop", "master");
fixture.Checkout("master");
fixture.ApplyTag("2.0.0");
// Create hotfix branch
fixture.Checkout("1.3.0");
fixture.BranchToFromTag("support/1.x", "1.3.0", "master", "support");
fixture.MakeACommit();
fixture.AssertFullSemver("1.3.1+1");
fixture.BranchTo("hotfix/1.3.1", "hotfix2");
fixture.Activate("hotfix/1.3.1");
fixture.MakeACommit();
fixture.MakeACommit();
fixture.AssertFullSemver("1.3.1-beta.1+3");
// Apply beta.1 tag should be exact tag
fixture.ApplyTag("1.3.1-beta.1");
fixture.AssertFullSemver("1.3.1-beta.1");
fixture.Checkout("support/1.x");
fixture.MergeNoFF("hotfix/1.3.1");
fixture.Destroy("hotfix/1.3.1");
fixture.NoteOver("Hotfix branches are deleted once merged", "hotfix/1.3.1");
fixture.AssertFullSemver("1.3.1+4");
fixture.ApplyTag("1.3.1");
fixture.AssertFullSemver("1.3.1");
}
}示例13: ShouldPickUpVersionFromMasterAfterReleaseBranchMergedBack
public void ShouldPickUpVersionFromMasterAfterReleaseBranchMergedBack()
{
var config = new Config
{
Branches = new Dictionary<string, BranchConfig>
{
{
"master", new BranchConfig()
{
TracksReleaseBranches = true,
Regex = "master"
}
}
}
};
using (var fixture = new EmptyRepositoryFixture())
{
// Create release branch
fixture.MakeACommit();
fixture.BranchTo("release/1.0");
fixture.MakeACommit();
// merge release into master
fixture.Checkout("master");
fixture.MergeNoFF("release/1.0");
fixture.AssertFullSemver(config, "1.0.1+2");
// create a feature branch from master and verify the version
fixture.BranchTo("feature/test");
fixture.AssertFullSemver(config, "1.0.1-test.1+2");
}
}示例14: MergedFeatureBranchesToMasterImpliesRelease
public void MergedFeatureBranchesToMasterImpliesRelease()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.Repository.MakeACommit("1");
fixture.MakeATaggedCommit("1.0.0");
fixture.BranchTo("feature/foo", "foo");
fixture.MakeACommit("2");
fixture.AssertFullSemver(config, "1.0.1-foo.1");
fixture.MakeACommit("2.1");
fixture.AssertFullSemver(config, "1.0.1-foo.2");
fixture.Checkout("master");
fixture.MergeNoFF("feature/foo");
fixture.AssertFullSemver(config, "1.0.1");
fixture.BranchTo("feature/foo2", "foo2");
fixture.MakeACommit("3 +semver: minor");
fixture.AssertFullSemver(config, "1.1.0-foo2.1");
fixture.Checkout("master");
fixture.MergeNoFF("feature/foo2");
fixture.AssertFullSemver(config, "1.1.0");
fixture.BranchTo("feature/foo3", "foo3");
fixture.MakeACommit("4");
fixture.Checkout("master");
fixture.MergeNoFF("feature/foo3");
fixture.SequenceDiagram.NoteOver("Merge message contains '+semver: minor'", "master");
var commit = fixture.Repository.Head.Tip;
// Put semver increment in merge message
fixture.Repository.Commit(commit.Message + " +semver: minor", commit.Author, commit.Committer, new CommitOptions
{
AmendPreviousCommit = true
});
fixture.AssertFullSemver(config, "1.2.0");
fixture.BranchTo("feature/foo4", "foo4");
fixture.MakeACommit("5 +semver: major");
fixture.AssertFullSemver(config, "2.0.0-foo4.1");
fixture.Checkout("master");
fixture.MergeNoFF("feature/foo4");
fixture.AssertFullSemver(config, "2.0.0");
// We should evaluate any commits not included in merge commit calculations for direct commit/push or squash to merge commits
fixture.MakeACommit("6 +semver: major");
fixture.AssertFullSemver(config, "3.0.0");
fixture.MakeACommit("7 +semver: minor");
fixture.AssertFullSemver(config, "3.1.0");
fixture.MakeACommit("8");
fixture.AssertFullSemver(config, "3.1.1");
// Finally verify that the merge commits still function properly
fixture.BranchTo("feature/foo5", "foo5");
fixture.MakeACommit("9 +semver: minor");
fixture.AssertFullSemver(config, "3.2.0-foo5.1");
fixture.Checkout("master");
fixture.MergeNoFF("feature/foo5");
fixture.AssertFullSemver(config, "3.2.0");
// One more direct commit for good measure
fixture.MakeACommit("10 +semver: minor");
fixture.AssertFullSemver(config, "3.3.0");
// And we can commit without bumping semver
fixture.MakeACommit("11 +semver: none");
fixture.AssertFullSemver(config, "3.3.0");
Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
}
}示例15: VerifyForwardMerge
public void VerifyForwardMerge()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.Repository.MakeACommit("1");
fixture.MakeATaggedCommit("1.0.0");
fixture.MakeACommit(); // 1.0.1
fixture.BranchTo("feature/foo", "foo");
fixture.MakeACommit();
fixture.MakeACommit();
fixture.AssertFullSemver(config, "1.0.2-foo.2");
fixture.Checkout("master");
fixture.MakeACommit();
fixture.AssertFullSemver(config, "1.0.2");
fixture.Checkout("feature/foo");
fixture.MergeNoFF("master");
fixture.AssertFullSemver(config, "1.0.3-foo.3");
}
}