Re: SV: SV: Force option for merges

Hans-Emil Skogh wrote:
> [About the "Force merge" option]
>>> How about "Silently delete locally modified files if deleted in
> repository"?
>>>
>>> If that really is what the option does, I'm not quite so sure about it
>>> being a good idea to add it..?
>> Well, right now that 'option' is always active :)
> I understand. But it still freaks me out a little. I'm used to saying
> "The only way you can lose local changes in SVN is by invoking the
> Revert command.", and I really wish for this to continue to be true.
> (Ok, updates in general can mess up your changes, but in a way that is
> (relatively) recoverable.)
>
> In my view, any (implicit) removal of local changes without asking is a
> really bad thing. It should not be scary to use SVN.

Changed the option for 1.6.x in r16564.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2361005
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].