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

Tortoisesvn 1.3.3

From: Brian Bober <bbober_at_eyewonder.com>
Date: 2006-04-11 23:12:12 CEST

I'm not on the mailing list, so please CC me and jhaygood AT NOSPAM eyewonder.com with any questions. Tortoisesvn is getting "chatBanner_Inc.xslt" and "aolchatBanner_Inc.xslt" confused in a patch file, probably because "chatBanner_Inc.xslt" is part of the name "aolchatBanner_Inc.xslt". I got a dialog box when trying to apply the patch: "The file chatBanner_Inc.xslt was found twice..". I've attached a picture of the dialog box.

The two offending sections of the patch are as follows:

Index: aolchatBanner_Inc.xslt
===================================================================
--- aolchatBanner_Inc.xslt (revision 94)
+++ aolchatBanner_Inc.xslt (working copy)
@@ -150,7 +150,17 @@
 <xsl:call-template name="FLASH8AOLCHAT"/>
 </xsl:if>
 
+<xsl:variable name="xv_videoPath1">
+ <xsl:when test="not(videoPath1) or videoPath1=''"><xsl:value-of select="cp"/></xsl:when>
+ <xsl:otherwise><xsl:value-of select="videoPath1"/></xsl:when>
+</xsl:variable>
 
+<xsl:variable name="xv_videoPath2">
+ <xsl:when test="not(videoPath2) or videoPath2=''"><xsl:value-of select="cp"/></xsl:when>
+ <xsl:otherwise><xsl:value-of select="videoPath2"/></xsl:when>
+</xsl:variable>
+
+
 //FLASH VARS
 var ewflashvars<xsl:value-of select="adId"/>_c1 = 'ewbase='+cp<xsl:value-of select="adId"/>
         + '&amp;bwfile=bwtest.swf'
@@ -160,6 +170,8 @@
         + '&amp;buf=5,4,3,2,2,2'
         + '&amp;flv=' + ew<xsl:value-of select="adId"/>_flvNames1
         + '&amp;flvId=0'
+ + '&amp;videoPath1=' + <xsl:value-of select="$xv_videoPath1"/>
+ + '&amp;videoID1=' + <xsl:value-of select="videoID1"/>
         + '&amp;aInit=<xsl:value-of select="audioInit1"/>'
         + '&amp;vInit=<xsl:value-of select="videoInit1"/>'
         + '&amp;adId=<xsl:value-of select="adId"/>'
@@ -181,6 +193,8 @@
         + '&amp;buf=5,4,3,2,2,2'
         + '&amp;flv=' + ew<xsl:value-of select="adId"/>_flvNames2
         + '&amp;flvId=0'
+ + '&amp;videoPath2=' + <xsl:value-of select="$xv_videoPath2"/>
+ + '&amp;videoID2=' + <xsl:value-of select="videoID2"/>
         + '&amp;aInit=<xsl:value-of select="audioInit2"/>'
         + '&amp;vInit=<xsl:value-of select="videoInit2"/>'
         + '&amp;adId=<xsl:value-of select="adId"/>'
Index: chatBanner_Inc.xslt
===================================================================
--- chatBanner_Inc.xslt (revision 94)
+++ chatBanner_Inc.xslt (working copy)
@@ -66,6 +66,11 @@
 <xsl:call-template name="FLASH8"/>
 </xsl:if>
 
+<xsl:variable name="xv_videoPath">
+ <xsl:when test="not(videoPath) or videoPath=''"><xsl:value-of select="cp"/></xsl:when>
+ <xsl:otherwise><xsl:value-of select="videoPath"/></xsl:when>
+</xsl:variable>
+
 //FLASH VARS
 var ewflashvars<xsl:value-of select="adId"/> = 'ewbase='+cp<xsl:value-of select="adId"/>
         + '&amp;bwfile=bwtest.swf'
@@ -75,6 +80,8 @@
         + '&amp;buf=5,4,3,2,2,2'
         + '&amp;flv=' + ew<xsl:value-of select="adId"/>_flvNames
         + '&amp;flvId=0'
+ + '&amp;videoPath=' + <xsl:value-of select="$xv_videoPath"/>
+ + '&amp;videoID=' + <xsl:value-of select="videoID"/>
         + '&amp;aInit=<xsl:value-of select="audioInit"/>'
         + '&amp;vInit=<xsl:value-of select="videoInit"/>'
         + '&amp;adId=<xsl:value-of select="adId"/>'

Brian Bober
EyeWonder Developer / Support Specialist
bbober AT NOSPAM eyewonder.com

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org

ss.jpg
Received on Tue Apr 11 23:43:37 2006

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