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

Re: Partially recursive revert when node kind changes

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Thu, 10 Feb 2011 17:11:44 +0000

Branko Čibej <brane_at_e-reka.si> writes:

> On 10.02.2011 17:43, C. Michael Pilato wrote:
>> On 02/10/2011 11:28 AM, Philip Martin wrote:
>>> Suppose I have a directory tree:
>>>
>>> foo/
>>> bar/
>>> zig
>>>
>>> and I delete the tree foo/bar and replace it by a file foo/bar. What
>>> should "svn revert --depth=files foo" do? Should it revert foo/bar?
>>> How much of foo/bar should it restore?
>> It should restore foo/bar as a directory with all of its children still
>> scheduled for deletion, right?
>
> What happens to the file that was foo/bar, if reverting replaces it with
> a directory of the same name, in light of the policy of not deleting
> local files?

The file that was foo/bar is removed. That just the same as 1.6,
although 1.6 could only replace it with another file. In either case
the pre-revert content is lost. Revert is destructive.

-- 
Philip
Received on 2011-02-10 18:12:32 CET

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