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

Re: merges ignoring whitespace

From: Mark Clements <gmane_at_kennel17.co.uk>
Date: 2007-04-03 15:40:08 CEST

"Aidan Kane" <temp@scue.co.uk> wrote in message
news:b8f454b60704030632l6d70ce25p9e62eb9528b8bc7@mail.gmail.com...
> does anyone know if it's possible to preform a merge but to exclude
> changes to trailing whitespace?
>
> someone has committed a number of changes to the repository after
> having used a feature of eclipse that trims trailing whitespace from
> the ends of lines. unfortunately this means that it's now very
> difficult to see where the actual work was done. furthermore it's
> going to make comparing code prior to this revision that any code that
> we change later.

Well, you need to decide whether the whitespace is correct or not. That's
what merging is - deciding which of the changes is correct, therefore by
definition this is not possible to 'ignore' any changes to a file.

If, however, you mean is it possible to view the difference between the two
versions ignoring whitespace changes, then yes. I use WinMerge which has an
option to ignore whitespace differences, but I'm sure most diff software has
a similar feature if you know where to look.

- Mark Clements

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Apr 3 15:41:05 2007

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