On Wed, Dec 09, 2009 at 12:22:38PM -0800, Mike Dixon wrote:
> Daniel Näslund wrote:
> > On Wed, Dec 09, 2009 at 06:57:40PM +0100, Alexander Kitaev wrote:
> >> There is a serious bug in 1.6.6 (and in 1.6.5), external directory is
> >> not deleted when svn:externals property is deleted.
> >>
> >> That means that subsequent updates from a certain revision without any
> >> modifications made to the target working copy will fail:
> >>
> >> svn up -rN (svn:external set to "URL ext")
> >>
> >> svn up -rN+1 (svn:external deleted)
> >>
> >> svn up -rN+2 ("ext" directory added) - will fail because "ext" has not
> >> been deleted!
> >>
> >>
> >> Attached script reproduces the problem.
> >
> > Could this be issue 3351?
> > http://subversion.tigris.org/issues/show_bug.cgi?id=3351
>
> Sounds like issue 2371 to me:
> http://subversion.tigris.org/issues/show_bug.cgi?id=2371
Yeah, I agree.
[[[
Add XFailing test for #2371, update cannot replace svn:external with
versioned item.
* subversion/tests/cmdline/external_tests.py
(update_replace_external_with_versioned_item): In one update both a
svn:external dir is removed and added as a regular versioned item.
(test_list): Add the test with XFail set.
Patch by: Daniel Näslund <daniel{_AT_}longitudo.com
]]]
As pointed out in the issue tracker, a design decision was to postpone
the handling of externals to after the regular update. Not sure if it's
easily fixed. I would assume that it needs some major rearrangemant of
code.
Daniel
Received on 2009-12-10 10:37:06 CET