[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: Bob Archer <bob.archer_at_amsi.com>
Date: Mon, 9 Nov 2009 09:40:27 -0500

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.

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


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)


Daniel Becroft
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 15:41:36 CET

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