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

[Subclipse-users] Ignore Whitespace During *Merge*

From: Jamie Jackson <jamiejaxon_at_gmail.com>
Date: Thu, 21 Apr 2016 14:36:58 -0400

This topic came up before (
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=907463
), but I'm not sure it was really resolved.

In TortoiseSVN, there are a few whitespace-related options in the merge
dialogs:

   - Ignore line endings
   - Compare whitespace
   - Ignore whitespace changes
   - Ignore all whitespaces

(The last three are radios, BTW--mutually exclusive.)

I routinely use the "ignore whitespace changes," and that affects behavior
at *merge* time. In other words, that tends to create fewer conflicts when
there are wholesale indentation changes going on.

The option "Ignore whitespace" in Eclipse don't seem to behave the same
way; rather, it seems to affect what is *displayed* in the conflict
resolution diff, rather than affecting the behavior of the automated merge,
itself.

After all these years, I still need TortoiseSVN in my toolbox because of
this feature; however, I'd love to drop it.

Please let me know if I've missed some option to emulate the *merge* (not
the diff viewing) behavior in Subclipse. Otherwise, please treat this as an
enhancement request.

Thanks,
Jamie

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3169763

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2016-04-21 20:44:44 CEST

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