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

Re: In which situation will a deleted item be scheduled add/replace?

From: Philip Martin <philip_at_codematters.co.uk>
Date: Fri, 15 Aug 2008 17:59:30 +0100

"Rui, Guo" <timmyguo_at_mail.ustc.edu.cn> writes:

> On Fri, Aug 15, 2008 at 04:23:44PM +0100, Philip Martin wrote:
>> "Rui, Guo" <timmyguo_at_mail.ustc.edu.cn> writes:
>>
>> > On Fri, Aug 15, 2008 at 03:20:38PM +0100, Philip Martin wrote:
>> >> $ svn co URL wc
>> >> $ svn rm wc/some_file
>> >> $ svn ci wc # some_file has entry->deleted set
>> >> $ touch wc/some_file
>> >> $ svn add wc/some_file # some_file is also svn_wc_schedule_add
>> > Are you sure? My experiment shows the add will fail.
>>
>> It should work, look at update_after_add_rm_deleted in the
>> update_tests.py regression tests for an example.
> Sorry. I used a file instead and resulted in failure.
>
> So if the Add command will lead to both deleted&scheduled add, why does
> copy/move clear the deleted flag?

That looks like a bug.

    svnadmin create repo
    svn co file://`pwd`/repo wc
    touch wc/foo wc/bar
    svn add wc/foo wc/bar
    svn ci -mm wc
    svn up wc
    svn rm wc/foo
    svn ci -mm wc # foo is entry->deleted
    svn cp wc/bar wc/foo # BUG! foo is not entry->deleted
    svn revert wc/foo
    svn up -r1 wc

The last update should restore wc/foo but the copy bug means it
doesn't happen.

---------------------------------------------------------------------
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-15 19:00:05 CEST

This is an archived mail posted to the Subversion Dev mailing list.