Bernhard Merkle wrote:
> Hi Stefan
>
> On Nov 5, 12:10 pm, Stefan Küng <tortoise..._at_gmail.com> wrote:
>>> at the moment is seems that svn mergeinfo and eligible is not
>>> supported
>>> (I also searched this newsgroup and the user documentation/help file)
>> In the merge dialog, enter the data for the merge (the urls you want to
>> merge). Then click on "show log" button - the log dialog when started
>> from the merge dialog will show you the already merged revisions in gray.
>
> thanks for the fast reply. Two questions:
>
> - IMO this is not so obvious for the user, or do you think ? Maybe we
> can improve this...
> Could you add a little description also into the help file / user
> guide ?
The docs are Simons job :)
> - svn mergeinfo does this a separate operation (without doing in the
> context of a intended merge).
> So a bit the same problem as above. With svn mergeinfo I ask what
> could be merged without doing it.
> With your approach I am already in the context of merging and then
> asking what could be merged or better
> you are showing what already has been merged. Maybe also a checkbox
> (show what has been mergerd, what could be merged would make sense ?)
The command line client has a separate command for it. But you only need
that information when you want to merge, so I think the way it is
handled now is very good:
* user want's to merge
* user opens merge dialog, enters urls for merging
* user clicks on "show log" to select the revisions for merging
* log dialog shows already merged revisions in gray, other revisions in
black
So, the information about what has already been merged is right where
you need it: in the log dialog where you select the revisions for merging.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
Received on 2008-11-05 19:15:48 CET