Clarify external merging

2014-03-16 Thread Komka Péter
The SVN Book is not fully clear for me about the external merging. (svn-book.html#svn.advanced.externaldifftools.merge) There is 5 files (5 arguments, 5 filenames). Which of them may serve as input to the merge tool (meld), with what (initial) content, which of them may serve as output from meld,

svn_client_infox

2014-03-16 Thread Steenwyk, Chris
Hi, I recently upgraded from SVN 1.7.10 to 1.8.8. In the API I was using the "svn_client_info2" function to obtain the lock state of files in the "svn_info_t" struct. I see that in 1.8.8 this function is deprecated, but it calls "svn_client_info3" and still works. The issue I am bumping into is