You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Erik Huelsmann <eh...@gmail.com> on 2007/05/20 10:54:39 UTC
Re: svn commit: r25076 - in trunk/subversion: libsvn_wc tests/cmdline
On 5/20/07, lgo@tigris.org <lg...@tigris.org> wrote:
> Author: lgo
> Date: Sun May 20 03:04:21 2007
> New Revision: 25076
>
> Log:
> Fix issue #1808: if a file in a working copy is replaced by a special file,
> don't delete it during an update. This fixes a data loss issue.
>
> * subversion/libsvn_wc/adm_ops.c
> (svn_wc_remove_from_revision_control): check if a local non-special file was
> overwritten by a special file. If that's the case, consider the file locally
> modified and don't delete it.
>
> * subversion/tests/cmdline/special_tests.py
> (update_obstructing_symlink): new test
> (test_list): run the new test
Nice fix. Should we backport to 1.4.x?
bye,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r25076 - in trunk/subversion: libsvn_wc tests/cmdline
Posted by Lieven Govaerts <lg...@mobsol.be>.
Erik Huelsmann wrote:
> On 5/20/07, lgo@tigris.org <lg...@tigris.org> wrote:
>> Author: lgo
>> Date: Sun May 20 03:04:21 2007
>> New Revision: 25076
>>
>> Log:
>> Fix issue #1808: if a file in a working copy is replaced by a special
>> file,
>> don't delete it during an update. This fixes a data loss issue.
>>
>> * subversion/libsvn_wc/adm_ops.c
>> (svn_wc_remove_from_revision_control): check if a local non-special
>> file was
>> overwritten by a special file. If that's the case, consider the
>> file locally
>> modified and don't delete it.
>>
>> * subversion/tests/cmdline/special_tests.py
>> (update_obstructing_symlink): new test
>> (test_list): run the new test
>
> Nice fix. Should we backport to 1.4.x?
>
I think we should. Proposed for backport in r25078.
Lieven
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org