Re: SV: Force option for merges

Hans-Emil Skogh wrote:
>>> Maybe we should add a balloon tip hinting what it does?
>> The force option (always used before I added that option) for merges
>> doesn't really force the merge - the merge is done even if the force
>> option is not set. What it does is that it doesn't create a conflict
>> in situations where the merge would remove a file (it was removed in
>> the revision range you merge), but there's a local file present which
>> is either unversioned or has local modifications. In such a situation,
>> the force flag will make the merge simply remove the file.
>> What would you suggest the tooltip should say? It should be shorter
>> than my explanation above :)
> 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 :)

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=2360345
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].