On 04/06/2011 11:40 AM, Philip Martin wrote:
> Philip Martin <philip.martin_at_wandisco.com> writes:
>
>> Text and property conflict file names are stored in ACTUAL_NODE as
>> simple names and the WC code has to do path manipulation to obtain the
>> path from name. For the property conflict file the manipulation is
>> different for files and directories and this is a problem for the new
>> revert code as it may have removed the NODES row that contained the node
>> kind.
>>
>> To fix this I plan to store relpaths instead of names. There will be no
>> change to the SQLite tables, just to the way the existing columns are
>> used by the code. I'll bump the WC format and autoupgrade existing
>> working copies.
>
> 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?
--
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Received on 2011-04-06 17:43:33 CEST