SourceSafe merge at the project level

Question

I run SourceSafe and I have two branches of my code. I am currently using a manual approach to running a report to show the differences, and then manually merging each file one at a time. However, I am trying to find an optimized way to do this at the project level. This is normal if the process shows me each file one at a time, I just worry if I take turns manually for each file and merge each file separately, which I accidentally miss the file. While a “wizard” that I could trust to hit every file, even if it shows me every file before combining them.

I am new to merging, but not to sources, so I think you could say I'm a semi-beginner.

Answer 1

There seems to be no built-in way to do this through the user interface. But they do provide a command line tool that I wrote a batch file to simplify the specification of options:

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