Markus Schaber <m.scha...@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
