Merging Word docx files js error

[Alex Kokoshyn]

Hello,

On a Word docx document with a conflict mark, when I select the Edit
Conflicts option, I get such error:

Windows Script Host
Script: C:\Program Files\TortoiseSVN\Diff-Scripts\merge-docx.js
Line: 68
Char: 2
Error: The file appears to be corrupted.
Code: 800A16A0
Source: Microsoft Word.

Here's the screenshot:
<img src="http://tortoisesvn.googlegroups.com/web/word_merge_error.png?
gda=rUmAcUYAAAA6MNbWxJTHMZM2NMD51txLbOX0A8kJ9Ur9JybClJ9yXFG-
MxmCTk49FTaXD7i_CLx3riz0RlMs_1ov_iNdB7P8E-
Ea7GxYMt0t6nY0uV5FIQ&gsc=ehmuKhYAAAAL_94rnJvHHVOodgk-s7vUk-
BdbUbR9ixVt8TXtTugTQ">

Could anyone help? I have the latest version of TortoiseSVN, but this
is also happening with 1.5.3. Tried this on three machines, on two of
them I get this error, on the other one it works fine.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1846714

To unsubscribe from this discussion, e-mail: [users-un...@tortoisesvn.tigris.org].

[Stefan Küng]

Alex Kokoshyn wrote:
> Hello,
>
> On a Word docx document with a conflict mark, when I select the Edit
> Conflicts option, I get such error:
>
> Windows Script Host
> Script: C:\Program Files\TortoiseSVN\Diff-Scripts\merge-docx.js
> Line: 68
> Char: 2
> Error: The file appears to be corrupted.
> Code: 800A16A0
> Source: Microsoft Word.
>
> Here's the screenshot:
> <img src="http://tortoisesvn.googlegroups.com/web/word_merge_error.png?
> gda=rUmAcUYAAAA6MNbWxJTHMZM2NMD51txLbOX0A8kJ9Ur9JybClJ9yXFG-
> MxmCTk49FTaXD7i_CLx3riz0RlMs_1ov_iNdB7P8E-
> Ea7GxYMt0t6nY0uV5FIQ&gsc=ehmuKhYAAAAL_94rnJvHHVOodgk-s7vUk-
> BdbUbR9ixVt8TXtTugTQ">
>
> Could anyone help? I have the latest version of TortoiseSVN, but this
> is also happening with 1.5.3. Tried this on three machines, on two of
> them I get this error, on the other one it works fine.

What version of office do you have installed where it doesn't work? What
version of office is it where it works?

Stefan

--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1848035

[Alex Kokoshyn]

Hello Stefan,

Word 2007 is installed on all machines.

> ------------------------------------------------------http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr...@tortoisesvn.tigris.org].
>
>  signature.asc
> < 1KViewDownload

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1856060

[Alex Kokoshyn]

Hello Stefan,

In addition to my previous reply: Word 2007 is installed on all
machines. On the machine where merge works, TortoiseSVN 1.5.3 is
installed, on both machines where merge does not work TortoiseSVN
1.6.1 is installed. We have tried to install version 1.5.3 on the
other two machines but got the same error, we also tried to copy
scripts from the machine where it works and got the error again.

On Apr 21, 11:03 pm, Stefan Küng <tortoise...@gmail.com> wrote:

> ------------------------------------------------------http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr...@tortoisesvn.tigris.org].
>
>  signature.asc
> < 1KViewDownload

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1856115

[Stefan Küng]

Alex Kokoshyn wrote:
> Hello Stefan,
>
> In addition to my previous reply: Word 2007 is installed on all
> machines. On the machine where merge works, TortoiseSVN 1.5.3 is
> installed, on both machines where merge does not work TortoiseSVN
> 1.6.1 is installed. We have tried to install version 1.5.3 on the
> other two machines but got the same error, we also tried to copy
> scripts from the machine where it works and got the error again.

Unfortunately, I don't have office2007 available (don't have MSOffice at
home, and in our office we still use OfficeXP).
So someone else will have to debug this problem...

Stefan

--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1858842

[Alex Kokoshyn]

Thanks for looking into this anyway. If you know someone who can
provide any help with this, please tell me. We will appreciate any
hints or tips because we are going to use SVN for working with Word
files extensively.

> ------------------------------------------------------http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr...@tortoisesvn.tigris.org].
>
>  signature.asc
> < 1KViewDownload

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1859585

[Jared Silva]

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
changes made in r13557, so I recommend trying r13247.

Again, please try your current version with the changes from the
thread mentioned above, and then try the previous version from r13247.

Please let us know what happens in both cases, and please reply to the list.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1894435

[Stefan Küng]

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.

Stefan

--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1906781

[Alex Kokoshyn]

Hello Jared!

I changed the code as described in the following thread:
http://www.nabble.com/merge-docx.js-script-broken--tp18607513p21219658.html

and got this result:
http://farm4.static.flickr.com/3652/3612724921_37c431fa7d_o.png

Looking forward to your reply!
Alexander.

On Apr 24, 7:13 pm, Jared Silva <jay...@gmail.com> 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/56e9b...

>
> 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--tp18607513p2121965...
>
> Please use the following to find previous versions:http://tortoisesvn.tigris.org/source/browse/tortoisesvn/trunk/contrib...

>
> I suspect r14781 might be the culprit, and suspect I do not like the
> changes made in r13557, so I recommend trying r13247.
>
> Again, please try your current version with the changes from the
> thread mentioned above, and then try the previous version from r13247.
>
> Please let us know what happens in both cases, and please reply to the list.
>

> ------------------------------------------------------http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr...@tortoisesvn.tigris.org].

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2360821