Viewing the difference between two different codebases

If you are having a problem using Vault, post a message here.

Moderator: SourceGear

Post Reply
IlijaStevcev
Posts: 1
Joined: Thu May 01, 2008 12:41 pm

Viewing the difference between two different codebases

Post by IlijaStevcev » Thu May 01, 2008 12:48 pm

I am having trouble viewing the difference between two different codebases.

Here's what I'm trying to do:

I have two codebases in the same repository, A and B, which contain essentially the same files, but with some minor differences in some of the files. I am trying to compare the two to generate a list of differences.

I have the two codebases in different directories on my computer, say for example:
C:\CodebaseA
and
C:\CodebaseB

The way I am trying to accomplish this is by copying the files in C:\CodebaseA over to C:\CodebaseB and overwriting everything in there.

When I go into vault to find which files need a merge, it shows every file as renegade, even the ones that are identical bit for bit.

Is there a way I can accomplish this using Vault?

I'm using version 3.5.1 (4786) of Vault.

Any help would be much appreciated.

jeffhostetler
Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear
Contact:

A suggestion.

Post by jeffhostetler » Thu May 01, 2008 2:51 pm

As a suggestion, you can launch DiffMerge (aka SGDM) and
open a folder window that compares your A and B directories.
This will do a recursive comparison and for each pair of files
do a bit-wise comparison. You can then double click on the
highlighted items and see the individual file differences.

I don't remember if DiffMerge was listed in the Start Menu
(with the Vault client) for 3.5.1 or not. So you may have
to use Windows Explorer to find the sgdm.exe in the Vault
Folder in Program Files.

Something like:
C:\Program Files\SourceGear\Vault Client\sgdm.exe C:\CodebaseA C:\CodeBaseB

When you find a difference that you want to pickup, checkout
the B copy and apply changes from the A version using DiffMerge
as described above.

Hope this helps,
jeff

Post Reply