On Wed, Mar 10, 2010 at 9:15 PM, Greg Stein <gst...@gmail.com> wrote: > On Wed, Mar 10, 2010 at 21:23, Joe Swatosh <joe.swat...@gmail.com> wrote: >> Hi Philip >> >> On Wed, Mar 10, 2010 at 8:47 AM, <phi...@apache.org> wrote: >>> Author: philip >>> Date: Wed Mar 10 16:47:27 2010 >>> New Revision: 921445 >>> >>> URL: http://svn.apache.org/viewvc?rev=921445&view=rev >>> Log: >>> Remove some access batons from post-commit processing. >> >> Since this patch the Ruby bindings test has been failing on the Ubuntu >> build bot (and locally for me). I haven't looked at the patch closely >> so I'm not sure what's up, but the relevant part of the test is: >> >> Svn::Wc::AdmAccess.open(nil, @wc_path, true, 5) do |access| >> assert_raises(Svn::Error::WcPathFound) do >> access.mark_missing_deleted(path1) >> end >> FileUtils.rm(path1) >> access.mark_missing_deleted(path1) ### This line raises >> Svn::Wc::WcPathFound ### >> access.maybe_set_repos_root(path2, @repos_uri) >> end >> >> Judging by the name of the function, it appears to me that the test is >> correct.... >> I double checked, the rm is removing the file before the call. Could >> you check this please, or suggest how the test should be modified? > > The problem is that svn_wc__temp_mark_missing_not_present() now does a > call to read_info(), whereas before it simply checked the disk. The > function is verifying more state before progressing. In particular, > you must have a directory that is scheduled for deletion before > calling that function. Does your test properly set that up? > > Cheers, > -g >
Here is the current doc string for svn_wc_mark_missing_deleted: /** Mark missing @a path as 'deleted' in its @a parent's list of entries. * * Return #SVN_ERR_WC_PATH_FOUND if @a path isn't actually missing. * * @deprecated Provided for backward compatibility with the 1.6 API. */ I want to make sure I'm understanding correctly. It sounds like I need to svn del 'path's parent' before calling svn_wc_mark_missing_deleted on 'path.' Did I follow? If so, then no the test doesn't set that up. Thanks, -- Joe
