Branko Čibej <br...@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
