Re: merge does not show revision numbers

On Fri, Oct 29, 2010 at 8:29 PM, Frode Flem Mæland <
Frode.Maeland_at_ergogroup.no> wrote:

> When using Tortoise SVN client 1.6.7 or before that, when I merge by
> picking several revision numbers
>
> from the “Show log” dialog, the merge process shows the rev numbers
> processed, like this:
>
>
>
> Merging rX:
>
> Updated…
>
> Conflicted…
>
> Merging rY:
>
> Updated…
>
> Merging rZ:
>
> Updated…
>
>
>
> But in version 1.6.11, the process only shows the first revision number,
> like this:
>
>
>
> Merging rX:
>
> Updated…
>
> Conflicted…
>
> Updated…
>
> Updated…
>
>
>
> The whole merge is done, but client doesn’t show which revision numbers
> corresponds to which
>
> updates/conflicts, as in 1.6.7. For me this is quite annoying. Is this a
> known bug?
>

After the revisions are selected, what string is displayed in the "Revisions
to merge" field. Is it rX-rZ, or rX,rY,rZ? I've only noticed the multiple
"Merging rX" entries if they are non-contiguous.

Cheers,
Daniel B.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2677226

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-10-29 23:50:10 CEST