This is a weird case, Ben. Revert is (mostly) about undoing local
modifications to versioned files. The local modifications to versioned
files in this case were the deletion of those files. That there's now
another file in the spot of the deleted things is not itself a change to
the versioned file set. I'm not sure this particular case is as simple
as "you got what you asked for", and the situation isn't helped by the
fact that 'svn status' on a working copy like this gives no warning that
there's something there where nothing should be.
$ ls -1
cvsdbadmin
loginfo-handler
make-database
make-release
svndbadmin
$ svn rm make*
D make-database
D make-release
$ echo `date` >> make-database
$ echo `date` >> make-release
$ ls -1
cvsdbadmin
loginfo-handler
make-database
make-release
svndbadmin
$ svn st
D make-database
D make-release
$
That said, I think my initial response to this thread was a little
premature. We should (as a list) probably hash out what 'svn revert'
means in this scenario, keeping in mind the best experience for users.
Ben Collins-Sussman wrote:
> I don't understand. The definition of 'svn revert' is 'please make
> this file exactly the way it does in the repository'. It not only
> reverts file contents, but reverts delete scheduling. That's what you
> asked for, and that's what you got. It's one of the only commands
> that actually destroys information, so you need to be careful with it.
>
> On 12/18/06, Žiga Osolin <ziga.osolin@gimb.org> wrote:
>> I deleted some files, then I placed new files (the same name upon them)
>> and then I said revert, and SVN has overwritten the files. I think SVN
>> should check if files exist before rewriting with the files last
>> commited.
>>
>> Regards,
>> Žiga
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
>> For additional commands, e-mail: dev-help@subversion.tigris.org
>>
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>
--
C. Michael Pilato <cmpilato@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Received on Mon Dec 18 17:37:49 2006