Login | Register
My pages Projects Community openCollabNet

Discussions > users > [Subclipse-users] Ignore Whitespace During *Merge*

subclipse
Discussion topic

Back to topic list

[Subclipse-users] Ignore Whitespace During *Merge*

Author jamiejackson
Full name Jamie Jackson
Date 2016-04-21 11:37:00 PDT
Message This topic came up before (
http://subclipse.tig​ris.org/ds/viewMessa​ge.do?dsForumId=1047​&dsMessageId=907​463
), 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
Attachments

« Previous message in topic | 1 of 6 | Next message in topic »

Messages

Show all messages in topic

[Subclipse-users] Ignore Whitespace During *Merge* jamiejackson Jamie Jackson 2016-04-21 11:37:00 PDT
     Re: [Subclipse-users] Ignore Whitespace During *Merge* markphip Mark Phippard 2016-04-21 12:03:26 PDT
         Re: [Subclipse-users] Ignore Whitespace During *Merge* jamiejackson Jamie Jackson 2016-04-22 07:56:10 PDT
             Re: [Subclipse-users] Ignore Whitespace During *Merge* markphip Mark Phippard 2016-04-22 08:17:57 PDT
                 Re: [Subclipse-users] Ignore Whitespace During *Merge* jamiejackson Jamie Jackson 2016-04-22 09:03:15 PDT
                     Re: [Subclipse-users] Ignore Whitespace During *Merge* jamiejackson Jamie Jackson 2016-06-22 08:57:15 PDT
Messages per page: