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

Re: Merging Word docx files js error

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 25 Apr 2009 10:13:11 +0200

Jared Silva wrote:
> Alex Kokoshyn wrote:
>> Hello Jared,
>> I have a problem with the merge-docs.js file and I've started the
>> following thread. Could you please look at it?
>> http://groups.google.com/group/tortoisesvn/browse_thread/thread/56e9bf51e5e4c66a/c875862cee3247f9?lnk=gst&q=word#c875862cee3247f9
> Alex, I have been following your thread. I thought your issue was
> unique, but I was wrong. Someone else had your issue, but they did
> not follow through. I hope you do.
> Please see the following:
> http://www.nabble.com/merge-docx.js-script-broken--tp18607513p21219658.html
> Please use the following to find previous versions:
> http://tortoisesvn.tigris.org/source/browse/tortoisesvn/trunk/contrib/diff-scripts/
> I suspect r14781 might be the culprit, and suspect I do not like the

That change was necessary since Number() fails completely if the string
contains anything other than a plain number (e.g., an 'SP1' at the end
or some other text). ParseInt() however just stops at the first
non-number char and returns the number it got until the stop.

> changes made in r13557, so I recommend trying r13247.

That change shouldn't be the reason for this problem.


  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-04-25 10:13:24 CEST

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