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

Simple questions updating binary files

From: Adam Lofstedt <adaml_at_visimation.com>
Date: 2004-01-08 20:06:20 CET

Can you actually view the diffs in a binary file like a MS Word .doc, see
the changed lines, and then merge those changes? When I try to do that with
TortoiseSVN, I get jibberish when viewing the diffs and merges. I don't
think so, but maybe I'm wrong?

Also, using TortoiseSVN, what is the best way to replace your changed local
copy of a binary file with the latest copy in repository? When I try update,
it tells me there is a conflict, and won't let me update. When I try
Switch, it doesn't do anything because the files are in conflict. When I
try Update to revision, and specify the latest revision in the repos, it
still doesn't do anything, and leaves my local copy intact. If I delete the
file from windows explorer, and then update the project, it seems to be the
only way to do a replace. Is there something simple I'm not doing?

Thanks a bunch,


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jan 8 20:07:07 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.