Hi, Von: MARTIN PHILIP > Markus Schaber <m.scha...@3s-software.com> writes:
>> To be honest, after thinking twice, I'm not sure whether my change >> actually changes user-visible behaviour for non-binary files. My >> assumption was that merge_text_file() call following the >> merge_file_trivial() eventually produces the same result in that case, >> just using a different path to arrive there. > > That depends on the text merge algorithm. At present > > svn up --diff3-cmd /bin/false > > would cause a conflict but with your patch the merge code is not invoked > so the "merge" succeeds. Does that matter? I don't know. I'm not sure about that, too. If you want, I can change my code to only kick in for binary files. But that would lead to inconsistent behaviour between text and binary files, I'm not sure whether that's better. > One thing that is still not quite right is that the final state of the > file is unmodified but NODES.last_mod_time is not set. It's not caused > by your patch but ideally we would update last_mod_time. Is there anything I can do to set it at that place? Or should that be cared of at a different place? Thanks, Markus -- uberSVN: Apache Subversion Made Easy http://www.uberSVN.com
