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

Re: The same binary files but show conflict

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 03 Sep 2008 21:16:43 +0200

Edwin wrote:
> Because commit binary files to SVN is very slow, I copy my binary
> files to other machine to do. After other machine commit, I update my
> local machine then conflict appears. The files would be the same files
> isn’t it? Is there anyone meet the same situation? Thanks

When you update, Subversion sends a binary diff. But since your local
file is the same as the one it wants to update to, the diff can't be
applied.
You have to revert your binary file first before updating if you want to
avoid the conflict.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net

Received on 2008-09-03 21:17:01 CEST

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