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

Please unsubscribe - Thanks !

From: Joe Dayney <joseph.h.dayney_at_rrd.com>
Date: Wed, 11 Nov 2009 11:40:14 -0700

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.h.dayney_at_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.archer_at_amsi.com>
11/09/2009 07:41 AM
Please respond to
users <users_at_tortoisesvn.tigris.org>

To
users_at_tortoisesvn.tigris.org
cc

Subject
RE: TSVN - Merge Tracking

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
 
________________________________________
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].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2416686
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-11-11 19:42:53 CET

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