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

Re: Tree conflict bug?

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Fri, 31 Oct 2008 20:19:00 +0000

So, what have we found?

* "revert" acts on the parent dir, but needs to act on a victim instead
for consistency.
  - I'm fixing that.

* "revert -R" fails to revert the whole WC,
  - I haven't yet reproduced that.

* Commit fails with poor error message "File not found: transaction
'2-3', path '/foo'" instead of "Out of date".
  - To be investigated.

* Revert then update leads to "WC is corrupt... Attempt to add tree
conflict that already exists". That's possibly a bad error message: I
think it might mean that there's a bug in the code that's trying to
raise a new conflict, not that the WC is corrupt.
  - We must change the error message to admit that it might well be a
  - The cause is to be investigated.

I've started tackling the "revert must act on a victim" now, but I'm not
sure that is the most urgent issue, since as far as I can tell it does
actually work (clear tree conflict indications) if you give it the
parent path (or recursive).

Steve, you just committed a change to make "update" carry out a deletion
while raising a tree conflict. I don't get why that's what we need. Is
that in keeping with a plan or is it just addressing the current
situation? I thought the plan was to skip any updating when we raise a
tree conflict, but I'm afraid I've rather lost track of the grand plan
through concentrating on the individual parts of it.

- Julian

To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-31 21:19:19 CET

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