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

RE: Ignore newline characters in shell view and Commit and related dialogs?

From: David Balažic <david.balazic_at_comtrade.com>
Date: Mon, 22 Oct 2012 12:19:42 +0200

Ben Johnson wrote:
> I realize that the *diff* viewer is capable of ignoring newline
> differences, as well as white-space differences.
> I'm wondering if the same filtering can be applied to the
> Explorer shell
> view and icon overlays, as well as the Commit and related dialogs.
> Basically, I hand-off code to a third party, who makes
> changes and then
> provides the modified files, which I then have to merge into the
> repository. Every time I receive the files, the line-endings have
> changed, and I would like to avoid seeing every file as modified when
> there are no fundamental differences.
> Without this capability, I have to perform a diff on every file,
> manually, to ensure that the changes are purely newlines or
> white-space.

You could try a diff on the folder, telling it to ignore white space changes.
This way you would get just the actual changes.

I'm not sure if the TSVN diff tool supports this, if not you might have to use another tool (and compare a clean checkout with the modified files from your third party). Possible candidates: WinMerge, kdiff3, etc...



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-10-22 12:20:02 CEST

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.