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

Re: TSVN: assorted questions

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 27 Aug 2009 10:06:55 +0200

On 27.08.2009 08:12, petermity wrote:
> Have the various TSVNCache fixes over the past month or two been
> released? I have been holding off updating from 1.6.2 but I
> don't see them listed in the 1.6.5 release notes. If not, is it
> likely soon?

Yes, they're in there. But as you can see from a few posts on the dev
list in the past few days we made more changes and fixes to the cache.
I'm currently building another 1.6.x nightly which will be up in a few

> The SVN book is great, but I mostly use TSVN. For the most part
> it's easy to correlate the command-line to TSVN, but I'm not sure
> on the following, what are the TSVN equivalents for:
> - Eligible: svn mergeinfo URL/trunk --show-revs eligible

Merge dialog, merge range of revisions, next. Fill in the url, click
"Show log". The log dialog now shows you all the revisions that are not
merged yet in black, the merged ones in gray.

> - Cherry picking: svn merge -c 345 URL/trunk

Merge dialog. Just enter the revisions you want to merge.

> - Property conflict (.prej file):
> svn resolve --accept
> or
> svn resolved

Right-click on conflicted file/folder, choose 'resolve' from the TSVN


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-08-27 10:07:16 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.