On 26 November 2014 at 14:24, Kerry, Richard <richard.kerry_at_atos.net> wrote:
>
>
> 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 ?
>
>
Subversion/TortoiseSVN/TortoiseMerge only has native support for plain
text. Differencing Word files is done by Word itself with those scripts
telling it how to invoke Word. However if you have found WinMerge to be a
good tool then you can configure that to be your diff and/or merge tool of
choice for particular file types.
You can find how to do that here:
http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-settings.html#tsvn-dug-settings-progs
and there is even an example for how to do it for WinMerge :-)
Simon
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3091884
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-11-26 15:32:46 CET