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

RE: Re: Ignoring comments in TortoiseMerge?

From: Gleason, Todd <tgleason_at_impac.com>
Date: Fri, 12 Sep 2008 14:56:51 -0700

> 2008/9/12 <slstulke_at_rockwellcollins.com>:
> >
> > I work with autogenerated code a lot, and our particular tools
generate
> > quite a few short comments identifying sections of code by
> > frequently-changing numbers. This causes a blizzard of
non-functional
> > changes to become highlighted whenever preparing a diff. I looked
> through
> > the help and FAQ for an option to ignore the contents of comments
(we
> use C,
> > FWIW) but to no avail. Is an option like this on the horizon?
>
> How would it know the difference between an auto-generated comment and
> a comment you added/changed yourself.
>
> Even if TortoiseMerge could ignore these changes, Subversion won't. A
> changed line is a changed line no matter how it happened.

I've heard that Araxis Merge (http://www.araxis.com/) can do this via
some sort of regular expression-style configuration. But as Simon said,
Subversion never ignores any changes (even whitespace) so the files will
be marked as different and possibly in a state of conflict, regardless
of changes that any particular merge tool displays.

--Todd

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-09-13 00:07:04 CEST

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