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

Re: Tree conflict bugs I've just been finding

From: Neels J. Hofmeyr <neels_at_elego.de>
Date: Fri, 14 Nov 2008 02:19:10 +0100

Stefan Sperling wrote:
> On Thu, Nov 13, 2008 at 07:49:20PM +0000, Julian Foad wrote:
>> Bug: "resolved" complains if the target's parent isn't a WC:
>> [[[
>> $ svn resolved wc2
>> svn: warning: '.' is not a working copy
>> $ svn st wc2
>> M C wc2/foo
>> ]]]
> Hey Julian,
> I've tried to take a shot at this one. My current patch is below.
> 4 tests in tree_conflicts_tests.py are failing with this patch:
> FAIL: tree_conflict_tests.py 9: merge file: modify onto not-file
> FAIL: tree_conflict_tests.py 11: merge file: del/rpl/mv onto not-file
> FAIL: tree_conflict_tests.py 13: merge dir: modify onto not-dir
> FAIL: tree_conflict_tests.py 15: merge dir: del/rpl/mv onto not-dir
> I don't exactly know why. I may have an error in my patch.
> Maybe you can investigate?
> Thanks,
> Stefan

Although I'm not Julian, I know what the problem is: If we have a
tree-conflict victim that is unversioned as the target, the patch thinks
that that victim is a working copy root and skips checking it altogether.

Maybe we ought to rather check whether the parent of the target is a working
copy, nevermind checking whether the target is a working copy root.

Checking it out...

Received on 2008-11-14 02:19:32 CET

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.