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

RE: incorrect diff / merge

From: Brannon King <notacommie_at_gmail.com>
Date: 2007-03-29 22:31:00 CEST

Setting to ignore whitespace does make a great difference in this case,
though I usually like catching whitespace changes. What I would like is a
setting to make a whitespace mismatch some percentage as valuable as a
character mismatch.

------------

--- merge1.txt
+++ merge2.txt
-if(a){
- b
- c
- d
- e
- while(f){
- if(g)
- break;
+lock(sr){
+ if(a){
+ b
+ c
+ d
+ e
+ while(f){
+ if(g)
+ break;
        }
- if(g && h && i)
- return;
  }

-kgd

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 29 22:31:59 2007

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