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

TortoiseSVN/TortoiseMerge - Diff XML files ignoring irrelevant differences

From: Kerry, Richard <richard.kerry_at_atos.net>
Date: Wed, 26 Nov 2014 14:24:45 +0000

When differencing some file-types, eg XML, whitespace and some details of the syntax don’t actually mean a significant difference. Two XML files might appear from a straightforward text diff to be quite different, but to an XML-aware differencer they could be the same.

On looking at XML files in TortoiseMerge I am seeing these irrelevant differences and it is making it very difficult to spot real changes, either to plan my commit, or to do a merge.

I have come fairly recently to Subversion and TortoiseSvn and TortoieMerge, having used CVSNT/CVS Suite for many years. With CVSNT I’ve used WinMerge for showing differences. WinMerge comes with some filters to normalize irrelevant differences between files so this issue can be worked around (though the filters do prevent these file-types being merged).

Is there a feature for doing this within TortoiseSvn/TortoiseMerge ?
I notice that there is some filetype specific selection of differencing that is used for MS Word files, for example. I’ve found the “Advanced diff settings” page where plugins are configured for Word/Excel etc but there is no sign of anything provided for XML.

Is there anything built-in to ToitoiseSvn or TortoiseMerge that I’m missing ? Or any existing plug-in that I might consider using ?

Regards,
Richard.

Richard Kerry
BNCS Engineer, SI SOL Telco & Media Vertical Practice

T: +44 (0)20 3618 2669
M: +44 (0)7812 325518
Lync: +44 (0) 20 3618 0778
Room G300, Stadium House, Wood Lane, London, W12 7TA
richard.kerry_at_atos.net<mailto:richard.kerry_at_atos.net>

[cid:image002.png_at_01D00981.ECBD3B40]

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=3091883

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

image001.png
image002.png
Received on 2014-11-26 15:24:58 CET

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