[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: Kris Deugau <kdeugau_at_vianet.ca>
Date: 2007-03-29 22:15:05 CEST

Brannon King wrote:
> Thanks for responding. I don't know exactly what diff parameters the
> TortoiseSVN uses. But you are describing the exact issue I was having; the
> entire block is chucked when it should have aligned the "while" and "if"
> statements because white space is less valuable in programming than other
> characters. I guess what I want is some parameter that allows me to favor
> source-code type diffs.

Basically, this is normal. I know there are probably diff utilities
that work on a character basis - I also know that most of the ones most
people are likely to use in practice are *line*-based. (The standard
*nix diff and patch programs, for instance...) I *think* the *nix diff
has an option to ignore whitespace; I don't recall offhand if Tortoise
does or not, and if you can set it persistently.

Whitespace changes are still changes - whether they have meaning to
other tools working with the files or not.

And yes, it gets obnoxious trying to track "real" changes through this
mess. <g>

Tortoise IIRC has a nice display at the bottom of its diff window; it
*will* actually show you the per-character changes for whichever line
you click on. However, that's not all that useful in your case...

[Brannon sent me a screenshot offlist; here's a rough text
representation of what it would look like in a shell - a fairly normal

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


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:15:30 2007

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

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