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

Re: Feature Request: Ignoring whitespaces for merges

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-08-23 21:18:32 CEST

Matthias Bendewald wrote:
>> No, merging is done by the Subversion libraries and whitespaces are
>> a part of the change. No way to ignore them.
> Did you try the option "-x -w"? There are many other good options
> given that may help (--ignore-eol-style for example)
>> I suggest that you first agree upon a common intentation policy for
>> your project with all developers and
> then use a source code formatter on each developers PC to enforce
> this policy.
> I have no chance to force people to do that. So i NEED the -x -w
> options. TortoiseSVN forces me to use the command-line, though.

I'm currently working on this, but I don't think I'll have it ready
today. You'll have to wait a little bit until I can finish adding those
options to the merge dialog.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Aug 23 21:16:03 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.