"C. Michael Pilato" <cmpil...@collab.net> writes: >> I've got the new code working (not started on the upgrade code). The >> change spilled over into the public API in the form of the >> svn_wc_conflict_description2_t structure. This contains the names of >> the conflict files, but it is also used within libsvn_wc as a way of >> passing around conflict information. It's new in 1.7 so I decided to >> change it, it now contains abspaths rather than names. The alternative >> would be to introduce some other internal struct to hold the relpaths. > > Makes sense. abspaths -> names is a trivial transformation anyway, yes?
Yes, one of the places it happens is svn_wc__cd2_to_cd to produce the 1.6 structure. There is also a function svn_wc__cd_to_cd2 that goes the other way and that is hard to do, but since the function isn't used I simply deleted it. -- Philip