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

Conflict on identical binary files

From: Markus Schaber <m.schaber_at_3s-software.com>
Date: Fri, 24 Feb 2012 16:31:18 +0000


Given 2 binary files svnobj.r14 and svnobj.r17, I execute the following batch file:
--- snip ---
svnadmin create repo
svn mkdir -mm file:///C:/binconflict/repo/foo

svn checkout file:///C:/binconflict/repo/foo
Checked out revision 1.
cd foo/
copy ..\svnobj.r14 .\svnobj
svn add svnobj

svn commit -mm

copy ..\svnobj.r17 .\svnobj

svn commit -mm

copy ..\svnobj.r14 .\svnobj
svn update -r2
--- snap ---

The last step (svn update) triggers a conflict prompt for svnobj, despite the fact that the remote and local files are bit-for-bit identical.

As I was told by Daniel Shahaf, he expects this case to be resolved without a conflict.

This was reproduced using SlikSVN 1.7.2 32 bit on a clean WinXP VM, and using SlikSVN 1.7.2 64 bit and Tortoise 1.7.5's svn.exe 1.7.3 on my Win7 64 bit developer PC.

Best regards

Markus Schaber

We software Automation.
3S-Smart Software Solutions GmbH
Markus Schaber | Developer
Memminger Str. 151 | 87439 Kempten | Germany | Tel. +49-831-54031-0 | Fax +49-831-54031-50
Email: m.schaber@3s-software.com | Web: http://www.3s-software.com 
CoDeSys internet forum: http://forum.3s-software.com
Download CoDeSys sample projects: http://www.3s-software.com/index.shtml?sample_projects
Managing Directors: Dipl.Inf. Dieter Hess, Dipl.Inf. Manfred Werner | Trade register: Kempten HRB 6186 | Tax ID No.: DE 167014915 
Received on 2012-02-24 17:31:53 CET

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