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

Re: [PATCH] tolerate locally modified dirs on switch

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Sun, 24 Aug 2008 22:03:47 +0300 (Jerusalem Daylight Time)

Danil Shopyrin wrote on Fri, 22 Aug 2008 at 23:29 +0400:
> > [[[
> > Fix issue #2505: make switch continue after deleting locally modified
> > directories, as it update and merge do.
> >
> > * subversion/libsvn_wc/update_editor:
> > (leftmod_error_chain): tolerate SVN_ERR_WC_LEFT_LOCAL_MOD. The
> > whole error is cleared and SVN_NO_ERROR is returned if
> > SVN_ERR_WC_LEFT_LOCAL_MOD error is found in the error chain. And
> > we don't delete logfile in that case.
> > (do_entry_deletion): svn_wc_remove_from_revision_control() is called
> > with instant_error = FALSE.
> >
> > * subversion/tests/cmdline/switch_tests.py:
> > (tolerate_local_mods): New test.
> > (test_list): Run the new test.
> > ]]]
>
> I'm sorry. But the formatting is broken by my GMail. Rightly formatted
> log message is included as an attachment.
>
>

It looked fine here (see above). I'm a bit busy this week but I'll look
at this patch properly when I have some time for svn again. (If no one
else beats me to it :)).

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-24 21:04:06 CEST

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.