[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: Lübbe Onken <l.onken_at_rac.de>
Date: 2007-08-22 09:55:29 CEST

Hi Matthias Bendewald,

You wrote:

> Hi TortoiseFANS!
> I have to merge several projects with subversion sometimes.
> Each project is maintained by different persons, using
> different indentation... When it comes to merge, there are so
> many conflicts caused by differences in whitespaces! Is it
> possible to add a checkbox "ignore whitespaces" in the
> merge-dialog of TortoiseSVN?

No, merging is done by the Subversion libraries and whitespaces are a part of the change. No way to ignore them.

> That would make my life easier...

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.

Cheers
- Lübbe

--
       ___
  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 Wed Aug 22 09:53:07 2007

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