On Tue, May 3, 2011 at 12:40 PM, Stefan Küng <[email protected]> wrote: > On 03.05.2011 19:40, Hyrum K Wright wrote: >> >> On Tue, May 3, 2011 at 12:33 PM, Stefan Küng<[email protected]> >> wrote: >>> >>> Hi, >>> >>> Using a build from three days ago, I found that >>> svn info conflicted_file >>> doesn't report the simple conflict (not a tree conflict but a text >>> conflict). >>> >>> The doc string for 'conflicts' in the svn_wc_info_t struct reads: >>> Array of const svn_wc_conflict_description2_t * which contains info >>> on any conflict of which this node is a victim. Otherwise NULL. >>> >>> I assumed that this means any conflict, not just text conflicts? >>> So is the doc string wrong or the svn info API? >>> >>> in info.c, info_found_node_callback there's a call to >>> svn_wc__get_tree_conflict() but that of course returns NULL because there >>> are no tree conflicts on that file, only a text conflict. >>> >>> I think the doc string is correct but the API is wrong here, since I >>> can't >>> find another way to get the conflict info from a file with any other API. >> >> Heh. I *just* fixed this in r1099149. Could you give that a try and >> see if it works? > > Of course. Will take me a while to build everything. I'll report back in a > few hours...
Thanks. (And I'm amazed that we both came to the same conclusion independently at *exactly* the same time....) -Hyrum
