0 votes

I have a simple branch structure like so:


Baseline --> free10000 --> free10001
                       |
                       |-> free10002

All Branches are Baseline branches.

How do I compare the Baseline to e.g. free10002 so I see

-) Which files have changed

-) Which files are identical

-) Which files have been added or removed

Note: I tried file comparison. However, since the files get a different file version within the branch, and the file version is part of the file header, all files are different.

asked Feb 1, 2016 in Surround SCM by Robert

1 Answer

+1 vote
Best answer
This can easily be done using the Branch menu in the SurroundSCM Client. Under the Branch menu you will see "Branch Differences..." as a menu option.

Your current selected branch will be the Branch 1 and then you have the option to select the branch to compare it with as Branch 2.

Ensure you check recursive to include all sub folders (repositories) and files.

Now press the "Show Differences" button.

The Branch Differences dialog will show and you now have a number of filter options (bottom left hand side of the dialog) to show only certain type of files (identical, missing, renamed, moved, excluded, changed and identical).
answered Feb 1, 2016 by nico (8,200 points)
248 questions
262 answers
106 comments
2,047 users