[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 with switch

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 30 Sep 2009 13:35:55 +0100

On Wed, Sep 30, 2009 at 01:11:51PM +0100, Stefan Sperling wrote:
> However, the commit works with a Subversion trunk build:

> Note that trunk does not show 'S' notifications during 'svn status'.
> Can anyone explain this?

Note that the child URLs don't match:
1.6.x: URL: file:///tmp/test/repos/branches/r01/MyProject/MyFolder2/MyFile1.txt
trunk: URL: file:///tmp/test/repos/trunk/MyProject/MyFolder2/MyFile1.txt

I think this is explained by notes/api-errata/wc001.txt:

  In version 1.7, the new working copy format does not have a way to
  store an intended URL that is *different* from the location specified
  or implied by its parent. In this case, the child's URL is derived
  from the repository location of the original or the newly-switched
  parent directory. When the child's entry is fetched, it will have the
  correct value.

I.e. this part of the problem was a bug and it's been fixed in trunk,
but a backport to 1.6.x is unlikely.

Stefan

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2402049
Received on 2009-09-30 14:36:10 CEST

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