[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: merge does not show revision numbers

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 29 Oct 2010 18:56:47 +0200

On 29.10.2010 12:29, Frode Flem Mæland 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?

Are you sure that the other revisions (those which aren't shown) really
are merged? Maybe they were already merged before so they won't get
merged again, even if you specify them.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2677174
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-10-29 18:57:03 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.