How do you compare local and remote versions of a file?

  • Thread starter Thread starter aualias
  • Start date Start date
A

aualias

Hi,

Using ASP.NET, how can I compare my local version of a file to a version on
the server?

Another developer made changes to the file that I am working on and I do not
want to lose (well, I sort of do...) his changes.

Thanks.

AU
 
Karl,

We (they) are not using Source Safe. I have it locally on my computer for
other development, so I would be able to use the diff tool (or another
diff), but how can I get the remote version of the file without overwriting
my local copy?

I know that I can backup locally, but there must be an easier method.

Thanks.

Alfredo
 
Hi Alfredo,

As for how to diff the files on different machine(local and remote side),
generally, if we're implementing source file management in development,
it's better to make use of some certain source control tools such as VSS ,
CVS....
That's the formal and safe means. Here are some resources on source control
in MSDN:

#Web Projects and Source Control Integration in Visual Studio .NET
http://msdn.microsoft.com/library/en-us/dv_vstechart/html/vetchWebProjectsSo
urceControlIntegrationInVisualStudioNET.asp?frame=true

#Source Control Services
http://msdn.microsoft.com/library/en-us/sccvs70/html/veoriSourceCodeControlS
ervices.asp?frame=true

Also, there some file diff tools which may also help on simple file
compare.

#WinDiff
http://msdn.microsoft.com/library/en-us/tools/tools/windiff.asp?frame=true

#RGDiff - Visual Diff Tool
http://www.codeproject.com/tools/rgdiff.asp

Hope helps. Thanks.

Regards,

Steven Cheng
Microsoft Online Support

Get Secure! www.microsoft.com/security
(This posting is provided "AS IS", with no warranties, and confers no
rights.)

Get Preview at ASP.NET whidbey
http://msdn.microsoft.com/asp.net/whidbey/default.aspx
 
Thanks Steven,

Unfortunately, using source control is not possible with the people I am
working with. I have strongly suggested it, but they think it is too much
trouble. I guess I will just have to back up my local file, refresh from
the server, and do a diff between the two (in theory, nobody else should
have been working on these files...).

Thanks for your help.

Alfredo
 
Back
Top