Re: Visual Source Safe 8.0 advice please


"GCB-Toronto via DotNetMonster.com" <u42128@uwe> wrote in message news:81407425571c8@xxxxxx
Mark Tolonen wrote:
Is there a convenient way to find differences between source files in the
database and a project, *and then* merge the differences into the
[quoted text clipped - 9 lines]
VSS
users can tell me about.

There is an option when checking out files "Don't get local copy".

If you compare the differences between your local copy of the project and
the database, you can select all the changed files, check them out with
"Don't get local copy", and then check them all back in again (but it is
even easier to check the files out before you change them ;^)


But one other thing, on a related issue. When doing the compare, what is the
best best way to do a line-by-line manual merge with the database, in case
only some of the changes from the new files are desired? The built-in merge
function seems like it can only be triggered automatically under certain
conditions, rather than having a sort of "edit / merge these two files".

You don't say whether what version of tools you are working with, so I will assume Visual SourceSafe 2005 for now. I think this is the same in VS6.0 as well, but don't have it in front of me to verify.

When you pull a project with Get Latest, the files should be read-only on your file system. Normally, when you check out a file VSS will then make the file read-write. If you are changing the files offline, you make the files read-write yourself and change them. In this case, once you are online again, you can perform Get Latest again, select Advanced, and select Replace Writable: Merge. This will automatically check out and merge any writable files in your local copy, plus update any files changed by other people while you were offline. The built-in merge utility will only come up if there are conflicts between changes you and someone else has made while you were offline. Also, in this conflict case, a copy of your original file will be made with a .org extension. Nothing will be checked in, so after the merge you can diff your local copy with the database to review any differences before checking them in.

--Mark

.

Relevant Pages

  • Re: Upload Problem Using ASP
    ... administration form offline to the offline database, ... certain field i made in database. ... I can read images names by the same way, do u have anyway to complete ... > make a small visual basic program to upload the database and the images to ...
    (microsoft.public.inetserver.asp.general)
  • Re: What is prev1.edb and why is it 15 GB?
    ... > Whereas the database was new and everything was available> to rebuild the database we moved all the database and log> files into a temporary location. ... Had to manually mount the mail store so it> created a new database. ... Only> problem we have is when starting Outlook on the clients> we get a message stating Exchange is currently in> recovery mode. ... The choices are connect, work offline and> cancel. ...
    (microsoft.public.windows.server.sbs)
  • Offline Oracle Applications
    ... My client currently has a main FoxPro database at their office. ... The offline application was for creating new records ... their job to change the way they import this exported data into the ...
    (microsoft.public.dotnet.framework.adonet)
  • Re: Esetuil
    ... We area mission critical company..We can't just take a database offline to ... However I do think you're absolutely right about the disk solution and am ... Exchange MVP 2007 ...
    (microsoft.public.exchange2000.general)
  • Re: Python Database Apps
    ... It's gonna be a desktop app. ... so that I don't need a database server on the client side. ... If you have an offline mode then the most important thing to work out ...
    (comp.lang.python)