[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Making delete resolve tree conflicts

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Thu, 05 May 2011 14:48:49 +0100

Philip Martin <philip.martin_at_wandisco.com> writes:

> 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

After discussion on IRC i think we agree that leaving an "orphaned"
actual-node for X/Y/A is wrong. So how should svn_wc__db_op_delete
behave? It could:

  - delete the orphaned conflict but leave any non-orphaned conflicts
  - move the orphaned conflict to some non-orphaned row
  - fail, with an error about the orphaned conflict
  - delete all conflicts

I still favour making delete remove all tree conflicts. It's both easy
to implement and easy to explain. It's also what happens with text and
property conflicts.

Received on 2011-05-05 15:49:24 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.