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

RE: [TSVN] TortoiseSVN - FAQ

From: McKenna, Simon (RGH) <Simon.McKenna_at_rgh.sa.gov.au>
Date: 2004-11-09 08:51:12 CET

-=> How does one use the merge feature in tortoise svn? I am
-=> trying to merge
-=> from a branch into the trunk. In the merge dialog I have
-=> the brank url
-=> in the from field and use the latest revision number and in the to
-=> field I have the trunk url and merge to the head revision. What am I
-=> doing wrong?

When you right clicked and selected merge, did you do so
on a checkout of the Trunk (correct) or on a checkout
of the Branch (incorrect)?

Not 100% sure this is your problem, but the first time
I attempted to merge, I was trying to merge my branch back
into itself and couldn't figure out why nothing happened :)

Also, Lübbe, with the HTMLHELP docbook build, could you
add the option to hide the root folder please? Seems a bit
pointless. This parameter does the trick:

<xsl:param name="htmlhelp.hhc.show.root">0</xsl:param>

peace - si
sshnug.com (diggin' eclipse's OxygenXML plugin:)

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Nov 9 08:50:50 2004

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