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

Re: TSVN - Merge Tracking

From: Daniel Becroft <djcbecroft_at_gmail.com>
Date: Wed, 18 Nov 2009 08:47:35 +1000

On Wed, Nov 11, 2009 at 9:13 AM, Daniel Becroft <djcbecroft_at_gmail.com> wrote:
> On Tue, Nov 10, 2009 at 10:01 AM, Daniel Becroft <djcbecroft_at_gmail.com> wrote:
>> On Tue, Nov 10, 2009 at 9:04 AM, Bob Archer <bob.archer_at_amsi.com> wrote:
>>>> On Tue, Nov 10, 2009 at 8:47 AM, Bob Archer <bob.archer_at_amsi.com>
>>>> wrote:
>>>> > IF you do the following:
>>>> >
>>>> > o Right click on your WC
>>>> > o Select Merge
>>>> > o Leave Merge Type of Merge Range of Revisions
>>>> > o Click Next
>>>> > o Specify a URL to merge from
>>>> > o Click "Show Log"
>>>> >
>>>> > It is here where you will see the already merged in revisions as
>>>> grayed out. I think you will have to specify the "INclude merged
>>>> revisions" at the bottom to see the grayed out ones. Otherwise it
>>>> will only show revisions that are eligible to merge.
>>>>
>>>> Thanks, Bob. When I view the "Show Log" of the URL to merge from, I
>>>> see all revisions (including ones that have already been merged).
>>>> The
>>>> "Include merged revisions" option does not seem to do anything with
>>>> the log for the source. If I use that option on that target though
>>>> (the branch where I have already merged revisions into), then it
>>>> includes the log of the merged revisions. This seems to be
>>>> consistent
>>>> with the TSVN help (4.9.6 Merge Tracking Features), and the manual.
>>>
>>> Right, wouldn't you always start your merge by right click on the target? I should have said that as the first step... you right click on the merge target working copy.... as that is the location that TSVN will read the mergeinfo from.
>>
>> I have always been initiated the Merge command from right-clicking on
>> the target WC.
>
> Okay, I think I've just found something really strange. It doesn't
> appear to be an issue with determine what is a merged revision and
> what isn't, but more a problem with determining the color to use when
> trying to display the "grey" text.
>
> Currently, my XP Theme is set to "Windows Classic", and the merged
> revisions are in black, when they should be grey. If I change my XP
> Theme to "XP Theme Blue" (with or without the Show Log window still
> open), then the revisions magically change to grey (as I expected they
> should). If I change back to Windows Classic, they remain grey (a
> slightly different shade, but still).
>
> When changing the themes (above), I noticed that it isn't just an
> issue with the merged revisions display (which I originally thought it
> was). The following items also seem to switch back and forth between
> black and grey display (when they should be grey):
>  - the "For complete history deselect 'Stop on copy/rename' when
> viewing for a branch
>  - the 'Messages, authors and paths' text in the search box
>  - unrelated change paths in the bottom of the Show Log window
>
> But, if I restart my machine, the merged revisions go back to
> displaying in the black, instead of grey. Same working copy, same
> steps to view the log, same revisions, etc. I have had it switch back
> to the black font without a restart, but the restart is the only way
> to force it.
>
> It isn't just a problem on my machine, either. All the machines I've
> checked in the office have the issue - some are TSVN 1.5.8, some are
> 1.6.5, mine is 1.6.6. We're also running a mix of XP Luna theme and
> Windows Classic.
>
> Is the grey color used specific to TSVN, or is it pulled from a system
> color somewhere? Is there somewhere I can check to determine where
> this color is coming from? I've had a look at the code, but I'm not a
> C++ programmer, unfortunately.

Update: I've finally gotten around to resolving this. It turns out
that one of our internal systems was deliberately overriding the
COLOR_GRAYTEXT system color to be black. This was causing the
incorrect colors to be displayed with TortoiseSVN. We're in the middle
of correcting our system now.

Thanks to everyone for their help.

Cheers,
Daniel B.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-11-17 23:47:56 CET

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