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

Re: Conflict on identical binary files

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Fri, 24 Feb 2012 16:57:03 +0000

Markus Schaber <m.schaber_at_3s-software.com> writes:

> 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.

We could resolve the conflict in this case, but there is currently no
code to do it. Perhaps libsvn_wc/merge.c:merge_file_trivial could
detect this case and set svn_wc_merge_unchanged?

-- 
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com
Received on 2012-02-24 19:22:30 CET

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