RE: Problem with using SVN wih docx files
From: Kerry, Richard <richard.kerry_at_atos.net>
Date: Mon, 23 Feb 2015 18:21:50 +0000
On my (out of the box) installation of TortoiseSvn the extension-specific configuration for Word files calls Word itself to do the differences. It displays a set of windows showing all the differences and both original files.
Any diff utility that doesn't know how to do this, such as Tortoise's built-in one, will not show anything useful.
An attempt at patch generation is also unlikely to understand the format and may generate binary differences, which may be technically correct but are unlikely to be what you want, and will in general not appear to be the text you are expecting to see in the files.
The characters being described as "crappy" are binary data which is what all MS Office files contain.
Regards,
Richard.
[Blue line]
[Atos logo]
Am 23.02.2015 um 18:57 schrieb Mahmood N:
Fix: Not really, in theory maybe.
Yes. You miss something.
If you had a proper toolchain (a svn compatible patch/diff tool for docx
Michael
-- Michael Schlenker Senior Software Engineer CONTACT Software GmbH Tel.: +49 (421) 20153-80 Wiener Straße 1-3 Fax: +49 (421) 20153-41 28359 Bremen E-Mail: michael.schlenker_at_contact-software.com http://www.contact-software.com/ Registered office: Bremen, Germany Managing directors: Karl Heinz Zachries, Ralf Holtgrefe Court of register: Amtsgericht Bremen HRB 1321 ------------------------------------------------------ http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3100722 To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org]. Atos, Atos Consulting, Worldline and Canopy The Open Cloud Company are trading names used by the Atos group. The following trading entities are registered in England and Wales: Atos IT Services UK Limited (registered number 01245534), Atos Consulting Limited (registered number 04312380), Atos Worldline UK Limited (registered number 08514184) and Canopy The Open Cloud Company Limited (registration number 08011902). The registered office for each is at 4 Triton Square, Regent’s Place, London, NW1 3HG.The VAT No. for each is: GB232327983. This e-mail and the documents attached are confidential and intended solely for the addressee, and may contain confidential or privileged information. If you receive this e-mail in error, you are not authorised to copy, disclose, use or retain it. Please notify the sender immediately and delete this email from your systems. As emails may be intercepted, amended or lost, they are not secure. Atos therefore can accept no liability for any errors or their content. Although Atos endeavours to maintain a virus-free network, we do not warrant that this transmission is virus-free and can accept no liability for any damages resulting from any virus transmitted. The risks are deemed to be accepted by everyone who communicates with Atos by email. ------------------------------------------------------ http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3100727 To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].Received on 2015-02-23 19:22:34 CET |
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.