Force option for merges (was: Re: Suggestion for "select all" functionality in Commit dialog)

> Great work! (As always. =) ) And a good idea to make the force option
> avaliable for merges! Maybe we should add a balloon tip hinting what it
> does? I'm thinking about what they write about the option in the Subversion
> Book: "This option is the programmatic equivalent of doing your own
> electrical work with the power on—if you don't know what you're doing,
> you're likely to get a nasty shock." But then again, I guess that it should
> be pretty obvious... Or not. I remember some old collegues who were in the
> habbit of always checking the (equivalent) "force" option and then wondering
> why they ended up with all kinds of strange problems after a while.

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 :)

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