>>>>> "Benjamin" == Benjamin Smith-Mannschott <bsmith.occs_at_gmail.com> writes:
Benjamin> On Mar 21, 2008, at 20:45, Paul Koning wrote:
>>>>>>> "Troy" == Troy Bull <troy.bull_at_gmail.com> writes:
>>
Troy> Greetings I have a particular use case that I would be
Troy> interested in knowing if I am doing it correctly.
>>
Troy> I have a repo with a folder. This folder contains a bunch of
Troy> folders and files. Someone deletes one of the folders, then
Troy> commits a bunch of changes to the other things. Then she calls
Troy> me and says, I didnt mean to delete that folder. What I did
Troy> was go back to the last revision it appeared (one prior to the
Troy> delete), and did an svn copy back into where it belongs. Is
Troy> there a better way?
>> "svn merge" is a nice way to undo things.
>>
>> paul
Benjamin> It may not be possible to reverse just the deletion with
Benjamin> svn merge without losing her other changes, though that
Benjamin> could be compensated for with some clever use of svn revert
Benjamin> after merging.
Right. Or by issuing the merge in a suitable subdirectory of your
working directory (if the other changes are in some other subtree).
Revert works nicely for surgical "no, not that one" tweaks when it
isn't easily separated by pathname.
I like the merge because it makes it easier to avoid missing
something.
paul
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-03-22 00:43:57 CET