[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: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 10 Feb 2011 18:06:44 +0100

On Thu, Feb 10, 2011 at 05:47:04PM +0100, Branko Čibej wrote:
> 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?

Rename it to bar.reverted, and if that exists name it bar.reverted.N
(where N is some ever increasing number or a semi-random string with
an ever-increasing number appended to it)?

Stefan
Received on 2011-02-10 18:07:30 CET

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