Re: Making delete resolve tree conflicts

Julian Foad <julian.foad_at_wandisco.com> writes:

>> > It also solves one of the orphaned ACTUAL_NODE problems: if the
>> > conflicted node is within an added tree then deleting the tree and
>> > leaving the ACTUAL_NODE row could result in an ACTUAL_NODE that has no
>> > parents.
>>
>> That would still be a "local delete, incoming add upon update". Not
>> sure whether that would be located at the child, or at the deleted
>> ancestor. The update editor has a notion of conflicted parents, and
>> this seems to follow that case.
>
> I can't see how the no-parents thing could happen, because there would
> be a tree conflict only at the root-most parent that conflicts.

svnadmin create repo
svn mkdir -mm file://`pwd`/repo/A
svn co -r0 file://`pwd`/repo wc
svn mkdir --parents wc/X/Y/A
svn merge -c1 ^/ wc/X/Y
svn rm --force wc/X

sqlite3 wc/.svn/wc.db "select op_depth, local_relpath from nodes"
0|

sqlite3 wc/.svn/wc.db "select local_relpath from actual_node"
X/Y/A

-- 
Philip