Check for missing files and handle red-herring "needs merge"

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

Moderator: SourceGear

Post Reply
kevinkenny
Posts: 6
Joined: Sun Jan 31, 2010 10:07 am

Check for missing files and handle red-herring "needs merge"

Post by kevinkenny » Tue Mar 30, 2010 7:49 am

I've been asked to perform an audit on the source tree for a large classic ASP application.

It's suspected that there may be some files on the web server file system that haven't been added to Vault.

There's also been some incorrect use of Vault where a file is checked out to a users PC, edited, then checked in. The file is then uploaded via FTP to the web server. The copy of Vault on the web server then shows the file as "Needs Merge" even though the files are the same, which causes grief for the person responsible for deploying the latest build.

What I need to do is:

a) ensure that there are no missing files in the Vault repository for this application i.e. walk the folder tree and find out if the file exists in Vault.

b) walk the folder tree and do a diff of each file Vault. If there are no differences but there is a "Needs Merge" status then resolve the merge status.

Is there an easy way to do this, or do I need to put my scripting hat on?

I'm running Vault 5.0.2.


Thanks
Kevin

lbauer
Posts: 9736
Joined: Tue Dec 16, 2003 1:25 pm
Location: SourceGear

Re: Check for missing files and handle red-herring "needs merge"

Post by lbauer » Tue Mar 30, 2010 4:21 pm

If you install a Vault Client on the web server, you could login and create a working directory (or non-working directory) and do a get-latest. Then you can use DiffMerge to do a folder diff with the root of your working directory and the live directory that the web app is running from.

This would show all peerless files and any files that have changed. You can assume that files in the live directory that aren't in your working folder are not under version control. The ones that are identical , but show up as "need merge" could be quickly resolved. And any different files would need investigation.

Or you could do this on a local machine if you make a tarball/zip of the web app version and compare it locally on your machine?

Hope that helps.
Linda Bauer
SourceGear
Technical Support Manager

kevinkenny
Posts: 6
Joined: Sun Jan 31, 2010 10:07 am

Re: Check for missing files and handle red-herring "needs merge"

Post by kevinkenny » Wed Mar 31, 2010 5:19 am

Thanks for that Linda, didn't think about that approach. Will give it a shot.

Cheers
Kev

Post Reply