|
|
|
date: Sun, 16 Mar 2008 17:00:14 GMT,
group: microsoft.public.vstudio.sourcesafe
back
Re: Visual Source Safe 8.0 advice please
"GCB-Toronto via DotNetMonster.com" <u42128@uwe> wrote in message
news:81407425571c8@uwe...
> 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
date: Sun, 16 Mar 2008 21:07:40 -0700
author: Mark Tolonen
Re: Visual Source Safe 8.0 advice please
Mark, thanks again. I am using VSS 2005. Have you tried setting up the custom
editors under Tools > Options > Custom Editors? I have tried to substitute
the VSS file compare utility with another one but VSS seems to ignore my
setup and always uses the VSS one. The setup for File Difference and File
Merge is:
File Extension: .c *.h *.inc
Command Line: C:\Program Files\Files Comparer\Bin\FilesComparer.exe %1 %2
If I paste the command line into the Windows "Run" box it brings up the
FilesComparer.exe utility just fine so the I think the command line is OK.
Perhaps VSS does not like long-name paths (hard to believe) or does this
setup apply to some other part of the program that I don'e know about.
Mark Tolonen wrote:
>>>> Is there a convenient way to find differences between source files in
>>>> the
>[quoted text clipped - 9 lines]
>>>"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
>[quoted text clipped - 3 lines]
>> 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
--
Message posted via DotNetMonster.com
http://www.dotnetmonster.com/Uwe/Forums.aspx/mvs-vss/200803/1
date: Tue, 18 Mar 2008 11:17:30 GMT
author: GCB-Toronto via DotNetMonster.com u42128@uwe
Re: Visual Source Safe 8.0 advice please
"GCB-Toronto via DotNetMonster.com" <u42128@uwe> wrote in message
news:81563ddc8b033@uwe...
> Mark Tolonen wrote:
>>>>> Is there a convenient way to find differences between source files in
>>>>> the
>>[quoted text clipped - 9 lines]
>>>>"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
>>[quoted text clipped - 3 lines]
>>> 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, thanks again. I am using VSS 2005. Have you tried setting up the
> custom
> editors under Tools > Options > Custom Editors? I have tried to substitute
> the VSS file compare utility with another one but VSS seems to ignore my
> setup and always uses the VSS one. The setup for File Difference and File
> Merge is:
>
> File Extension: .c *.h *.inc
> Command Line: C:\Program Files\Files Comparer\Bin\FilesComparer.exe %1 %2
>
> If I paste the command line into the Windows "Run" box it brings up the
> FilesComparer.exe utility just fine so the I think the command line is OK.
> Perhaps VSS does not like long-name paths (hard to believe) or does this
> setup apply to some other part of the program that I don'e know about.
>
Try quoting the command and the individual parameters. That should help
when spaces are involved:
"C:\Program Files\Files Comparer\Bin\FilesComparer.exe" "%1" "%2"
--Mark
date: Tue, 18 Mar 2008 08:09:11 -0700
author: Mark Tolonen
|
|
