SourceSafe在项目级别合并 [英] SourceSafe Merge at the project level

问题描述

我正在运行SourceSafe，我的代码有两个分支.我目前正在使用手动方法来运行报告以显示差异，然后手动逐个合并每个文件.但是，我正在尝试找到在项目级别执行此操作的简化方法.如果该过程一次向我显示每个文件是可以的，我只是担心如果我对每个文件一个接一个地手动操作并分别合并每个文件，以至于我会不小心跳过一个文件.尽管有一个向导"，但我相信可以打出每个文件，即使它在合并之前向我显示了每个文件.

I'm running SourceSafe and I have two branches of my code. I'm currently using the manual approach of running a report to show differences and then manually merging each file one by one. However I'm trying to find a streamlined way to do this on the project level. It's ok if the process shows me each file one at a time, I'm just worried if I go manually one by one to each file and merge each file separately that I'll accidentally skip a file. Whereas a "wizard" I could trust to hit every file even if it shows me each and every file before merging them.

我是新手，但不是安全来源，所以我想你可以说我是新手.

I'm new to merging but not sourcesafe so I guess you could say I'm a half newbie.

推荐答案

似乎没有通过UI进行此操作的内置方法.但是它们确实提供了一个命令行工具，我最终编写了一个批处理文件以简化选项说明:

Looks like there isn't a built-in way to do this through the UI. But they do provide a command line tool which I ended up writing a batch file for to streamline option specification:

ECHO OFF
SET SSDIR=K:\Archive

SET /P MainProject=Please enter the project to merge into (e.g. "$/Trunk"):
SET /P BranchedProject=Please enter the branched project (e.g. "$/Active Branches/Branch1"):
SET /P Comment=Comment:

SS CP %MainProject%
IF NOT EXIST C:/BranchCheckouts MKDIR "C:/BranchCheckouts"
IF EXIST "C:/BranchCheckouts/mergelog.txt" DEL "C:/BranchCheckouts/mergelog.txt"
SS MERGE %BranchedProject% -GL"C:/BranchCheckouts" -O@"C:/BranchCheckouts/mergelog.txt" -C%Comment% -R
PAUSE

这篇关于SourceSafe在项目级别合并的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！