一:创建分支
private static void BranchFile(Workspace workspace, String newFilename) { String branchedFilename = Path.Combine(Path.GetDirectoryName(newFilename), Path.GetFileNameWithoutExtension(newFilename)) + "-branch" + Path.GetExtension(newFilename); workspace.PendBranch(newFilename, branchedFilename, VersionSpec.Latest, LockLevel.Checkin, true); var pendingChanges = workspace.GetPendingChanges(); int changesetForBranch = workspace.CheckIn(pendingChanges, "Branched file"); }
二:合并分支
private void Merge(Workspace workspace,string source,string target) { GetStatus status = workspace.Merge(source, target, null, null, LockLevel.None, RecursionType.Full, MergeOptions.None); status.NumConflicts.ToString();//冲突数量 status.NumFailures.ToString(); //失败数量 status.NumOperations.ToString();//服务器端的操作数量 status.NumWarnings.ToString(); //警告数量 }