[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: Tue, 10 Nov 2009 08:26:30 +1000

On Tue, Nov 10, 2009 at 12:40 AM, Bob Archer <bob.archer_at_amsi.com> wrote:
> 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).

Daniel B.

> From: Daniel Becroft [djcbecroft_at_gmail.com]
> Sent: Sunday, November 08, 2009 7:30 PM
> To: users_at_tortoisesvn.tigris.org
> Subject: TSVN - Merge Tracking
> Hi,
> 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-unsubscribe_at_tortoisesvn.tigris.org].
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2415800
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-11-09 23:27:02 CET

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