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

Re: Revision Graph and merges

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 30 Jun 2011 21:35:52 +0200

On 30.06.2011 14:36, Brendan Flanagan wrote:
>> On 30 June 2011 12:49, Simon Large
>> < simon.tortoisesvn_at_gmail.com> wrote:
>>
>> Provided you have been using merge tracking then I think that if you
>> just use the merge dialog and tell it to merge everything it will work
>> out what has not yet been merged. Not sure if it tells you the
>> revisions before doing the merge though. You'll have to try it and
>> see.
>
> An excellent idea - so I tried it... Although it doesn't tell you up front
> you can do a test merge and it will show what it would do.
>
> However - if (whilst in the Merge dialog) I hit the "Show Log" button for
> the branch I am merging from I think the log dialog is doing something
> really clever - it seems to show the already merged revisions in grey and
> the "yet to be merged" ones are normal font/colour.
>
> I can't seem to find this in the documentation - but if this is what it's
> doing then I think we have what we need and it’s a really good feature.
>
> The flip side is that it isn't actually doing that and I am just misinterpreting
> the colours?

No, you're right: that's exactly what the colors mean.

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=2781943
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-06-30 21:36:11 CEST

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