Re: "svn: Invalid tree conflict data"
From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 16 Oct 2008 11:04:52 +0200
On Wed, Oct 15, 2008 at 07:42:25PM +0200, Daniel Shahaf wrote:
It should.
> If so, why? How do the two changes disagree?
They don't. But when updating, we don't know whether what happened is
% svn move wc1/iota wc1/iota.moved; svn ci
Which is definitely a conflict.
> > If you disagree, how, exactly, would you define an add on top of an add?
The file (or directory) content also needs to be the same for it to
For directories, raising a tree conflict is the only option anyway.
What kind of conflict should be raised when files do not have matching
Stefan
---------------------------------------------------------------------
|
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.