[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 15:20:38 +0100

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

> I find some condition tests in libsvn_wc code base like this:
> (! entry->deleted || (entry->schedule == svn_wc_schedule_add))
> This kind of code appears in relocate.c and entries.c etc. Reading
> the code, I think it is used to catch a situation of both the
> excluded and add/replace schedule being set up for a single
> entry.

It occurs in mixed revision working copies. entry->deleted gets set
when a svn_wc_schedule_delete item is committed without a change to
the parent directory. Since that doesn't change the parent
directory's revision the entries file retains an entry for the deleted
item until a subsequent update.

    $ 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

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 16:20:55 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.