Fix some behaviour around "resolved" and tree-conflicts.
Take stsp's patch[*] and fix it: do not try to read entries from the parent direct…
Fix some behaviour around "resolved" and tree-conflicts.Take stsp's patch[*] and fix it: do not try to read entries from the parentdirectory of a working copy root that was supplied as a target.[*] See this post: http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=145293 Date: Fri, 14 Nov 2008 00:25:02 +0000 From: Stefan Sperling <firstname.lastname@example.org> To: email@example.com Message-ID: <20081114002502.GH6313@jack.stsp.name> Subject: Re: Tree conflict bugs I've just been findingAlso fix missing resolving of deleted and committed files that becametree-conflict victims during a merge.* subversion/libsvn_client/resolved.c (svn_client_resolve),* subversion/libsvn_wc/adm_ops.c (resolve_found_entry_callback): Ensure we do not end up trying to find tree conflict info in the parent directory of the working copy root.* subversion/libsvn_wc/entries.c (visit_tc_too_found_entry): Also visit tree-conflicts of deleted items.* subversion/tests/cmdline/resolved_tests.py (resolved_on_wc_root, resolved_on_deleted_item): New tests file with two new tests for the issues fixed by this commit.