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

"svn: Invalid tree conflict data"

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Mon, 13 Oct 2008 00:37:22 +0200 (Jerusalem Standard Time)

I'm getting the above error when I make the same wc-to-wc copy in two
wc's, commit in one of them, and update the other. A reproduction script
for Unix is attached[1]. Its output is pasted at [2].

I think this situation shouldn't raise a tree conflict in the first place
(at most, it should be a text conflict), since the same tree modification
(copy 'iota' to 'iota2', which hadn't existed before) was done in the wc
and in the incoming change.

Stefan "volunteered" to look/think about it over Subconf, but documenting
here for the benefit of those who aren't passing their Sundays on
#svn-dev. :)


[1] I'm booted to Windows ATM, so I haven't tried to run it.
[2] http://paste.lisp.org/display/68383

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-13 00:37:39 CEST

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