[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: How do I compare svn files with external copy of files

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Fri, 8 Feb 2013 19:37:34 +0000

> Farily new to tortoisesvn but it's so easy to use and does a wonderful job.
>
> I'm looking for a way to compare my svn files with copies of the production
> files to make sure there are no differences? On a few of the websites I manage
> the customer will sometimes make simple edits directly to the live files rather
> than through svn, how do I compare the two before editing to ensure I don't
> overwrite something they've updated?
>
> Thanks!
> -- Craig

Simple copy the live files to a working copy that is at the revision of your last deploy and TSVN will show the files that are different as changed. From there you can update the working copy, resolve any conflicts, commit the customers changes, then make your own modifications.

BOb

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3048153

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-02-08 20:37:43 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.