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

Re: branching WC folder fails with files marked as deleted

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Fri, 11 Jan 2013 09:49:34 +0000

"Roman Kellner" <muzungu_at_gmx.net> writes:

> If you can confirm that, when I find a "deleted" line in the .svn/entries
> file to a WC controlled file as shown below, then the file was only deleted
> in the WC and is marked for deletion in the repo which will be done with
> the next commit. Is this the exact meaning of "deleted" the the WC control
> area entries file? And there is no other meaning?

'deleted' in the entries file represents

    svn_wc_entry_t.deleted=TRUE

and is different from 'delete' which represents

    svn_wc_entry_t.schedule=svn_wc_schedule_delete

'delete' is when a file in the WC is marked for deletion at the next
commit. 'deleted' is when an entry is not present in the working copy
but would be expected given the revision of the parent.

So after

   svn rm f

f is 'delete' and after

   svn ci

f is 'deleted'

and after

   svn up

f is no longer in .svn/entries.

-- 
Certified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download
Received on 2013-01-11 10:50:19 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.