TSVN - Merge Tracking
Daniel Becroft
We have (finally) started to utilise the merge functionality in SVN,
and I have a couple of questions regard the Merge Tracking
functionality in TSVN.
In the manual, it states:
(URL : http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-merge.html#tsvn-dug-merge-tracking)
(3rd dot point) "When you show the log dialog from within the merge
dialog, revisions already merged are shown in grey."
Which log dialog is being referred to here? Is it the log for the
working copy, or the URL to merge from? Either way, I am not seeing
any of the revisions displaying in grey (even ones which I know have
already been merged to the target). If I view the log for the target,
I am correctly seeing the indenting for the merged revisions (but
these are still displaying as black, not grey).
Also, is this revision coloring TSVNs implementation of the 'svn
mergeinfo --show-revs' command (grey revisions are merged, black are
eligible)? If not, is there an implementation of this in TSVN?
Environment: TSVN v1.6.6 (Build 17493), WinXP SP3, Windows 'Classic'
theme (if that matters)
Regards,
---
Daniel Becroft
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2415641
To unsubscribe from this discussion, e-mail: [users-un...@tortoisesvn.tigris.org].
Bob Archer
BOb
________________________________________
From: Daniel Becroft [djcbe...@gmail.com]
Sent: Sunday, November 08, 2009 7:30 PM
To: us...@tortoisesvn.tigris.org
Subject: TSVN - Merge Tracking
Hi,
Regards,
---
Daniel Becroft
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2415641
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2415800
Daniel Becroft
> Look at the properties on the WC folder that you are merging into. If you don't see any svn:mergeinfo property there then as far as TSVN knows you haven't merged anything in yet.
>
> BOb
Thanks, Bob. That was the first thing that I checked.
There is the 'svn:mergeinfo' property on the root WC folder (and
there's also one on a folder a couple of levels down due to erroneous
merging, but we hope to remove that soon).
- If I run 'svn mergeinfo --show-revs merged' or 'svn mergeinfo
--show-revs eligible' for the same source/target URLs, AND from the
same working copy, the revisions appear where they are supposed to be.
- If I go TortoiseSVN > Show Log from the target WC, and select the
"Include merged revisions" option, then the merged revisions are
correctly shown, indented under the revision that actually performed
the merge (Note: They are still in a black font, though. Not sure if
they should be grey here).
- If I attempt to merge in a revision that has already been merged,
then the merge is performed, but no files are actually changed.
Everything seems to be working from a functional point of view, but I
still cannot determine where these revisions are supposed to be
displayed as grey (as it says in the TSVN manual).
Regards,
Daniel B.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2415936
Bob Archer
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.
BOb
> unsub...@tortoisesvn.tigris.org].
> >
> > ------------------------------------------------------
> >
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMe
> ssageId=2415800
> >
> > To unsubscribe from this discussion, e-mail: [users-
> unsub...@tortoisesvn.tigris.org].
> >
>
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMe
> ssageId=2415936
>
> To unsubscribe from this discussion, e-mail: [users-
> unsub...@tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2415943
Daniel Becroft
> 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.
In the TSVN help as well (same section as above), the screenshot shows
the merged revisions in grey, whereas on my machine, they are
continually appearing in the standard black font (even though they are
indented).
Regards,
Daniel B.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2415947
Bob Archer
> 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.
BOb
> ssageId=2415947
>
> To unsubscribe from this discussion, e-mail: [users-
> unsub...@tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2415949
Daniel Becroft
>> On Tue, Nov 10, 2009 at 8:47 AM, Bob Archer <bob.a...@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.
Regards,
Daniel B.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2415963
Daniel Becroft
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.
Cheers,
Daniel B.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2416311
Joe Dayney
Best Regards,
Joe
________________________________________________________________________________________
Joseph H. Dayney | Software Engineer | RR Donnelley
630W 1000N | Logan, UT 84321 | (: 435-755-4278 | 801-453-5015 |È: 435-770-7244 | Ê: 435-755-4210 | *: joseph....@rrd.com
This email and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply e-mail and destroy all copies of the original message.
| Bob Archer <bob.a...@amsi.com>
11/09/2009 07:41 AM
|
|
Andy Levy
changing the subject to read "please unsubscribe me" is not the way to
get removed.
To unsubscribe from this discussion, e-mail:
[users-un...@tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2416697
Daniel Becroft
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