Noorul Islam K M wrote on Fri, Jan 28, 2011 at 12:27:46 +0530:
> Daniel Shahaf <d...@daniel.shahaf.name> writes:
>
> > Looks good, but I have a question:
> >
> > Noorul Islam K M wrote on Wed, Jan 26, 2011 at 13:12:54 +0530:
> >>
> >> Attached is the python test for issue 3013. This incorporates the steps
> >> from the shell script attached in the tracker.
> >>
> >> Log
> >> [[[
> >>
> >> New XFail test for issue 3013.
> >>
> >> * subversion/tests/cmdline/update_tests.py
> >> (update_after_switching_to_deleted_path, test_list): New XFail test
> >>
> >> Patch by: Noorul Islam K M <noorul{_AT_}collab.net>
> >> ]]]
> >>
> >> Thanks and Regards
> >> Noorul
> >>
> >
> >> Index: subversion/tests/cmdline/update_tests.py
> >> ===================================================================
> >> --- subversion/tests/cmdline/update_tests.py (revision 1063610)
> >> +++ subversion/tests/cmdline/update_tests.py (working copy)
> >> @@ -5347,6 +5347,34 @@
> >> svntest.main.run_svn(None, 'delete', os.path.join('A2', 'mu'))
> >> svntest.main.run_svn(None, 'update', os.path.join('A2', 'mu'))
> >>
> >> +### regression test for issue #3013
> >> +def update_after_switching_to_deleted_path(sbox):
> >> + "update after switching to deleted path"
> >> +
> >> + sbox.build()
> >> + wc_dir = sbox.wc_dir
> >> + repo_url = sbox.repo_url
> >> +
> >> + # switch to A/B
> >> + svntest.actions.run_and_verify_svn2(None, None, [], 0, 'switch',
> >> + repo_url + "/A/B", wc_dir)
> >> +
> >> + # delete A/D
> >> + svntest.actions.run_and_verify_svn2(None, None, [], 0, 'rm',
> >> + repo_url + "/A/D", '-m',
> >> + 'Remove A/D')
> >> +
> >> + # switch to A/D and this is known to fail
> >> + svntest.actions.run_and_verify_svn2(None, None,
> >> svntest.verify.AnyOutput,
> >> + 1, 'switch', repo_url + "/A/D",
> >> wc_dir)
> >> +
> >> + # switch to A/D@1 and this is known to succeed
> >> + svntest.actions.run_and_verify_svn2(None, None, [], 0, 'switch',
> >> + repo_url + "/A/D@1", wc_dir)
> >> +
> >> + # update should succeed
> >> + svntest.actions.run_and_verify_svn2(None, None, [], 0, "up", wc_dir)
> >> +
> >
> > Should this 'update' succeed? In my testing, updating the wc root to
> > a revision it does not exist in fails.
>
> "/A/D" @ revision 1 does exist. So update should succeed but it is
> failing. This is the issue.
>
I think the issue is that the 'switch' is failing, nothing about the
update.
But, in fact: both switch and update work as long as the directory
they're targetting is a wc subdir (as opposed to a wc root). Therefore,
I'm inclined to mark the issue as FIXED and adjust the test to test that
the switch works when the being-switched directory is not the wc root.
Thoughts?
> Thanks and Regards
> Noorul
