Re: Merge dialog suggestions

Hans-Emil Skogh wrote:
> Hi all!
>
> I have been looking at the merge dialog a little (since I have been
> using it quite a lot lately). Here are some thoughts:
>
> - When the merge type "Reintegrate a branch" is selected, and next is
> pressed, the caption on the top of the dialog says "Tree merge", i guess
> it should say "Reintegrate a branch".

Done in r16126.

>
> - In the merge options dialog, when "Reintegrate a branch" is selected,
> I presume the merge depth should be grayed out. When trying it in the
> command line client, it says "svn: --depth cannot be used with
> --reintegrate".

Done in r16127.

>
> - I would also appreciate if the merge options dialog would indicate
> what type of merge that I'm currenly doing. Maybe I'm absent minded
> sometimes, but I would enjoy the extra security of seeing the merge type
> somewhere in that dialog. Maybe writing "Reintegrate a branch - Options"
> would work? Or maybe changing the title of the window to "Merge -
> Reintegrate a branch"?

Done in r16128: the group control title in the options page now
indicates the merge type.

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