[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: Duncan Murdoch <murdoch_at_stats.uwo.ca>
Date: 2007-03-30 01:11:08 CEST

On 3/29/2007 3:31 PM, 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.

TortoiseSVN (and svn) can be told to use an external diff. On Windows,
I recommend the (shareware) Beyond Compare. It does a very nice job of
displaying diffs.

Duncan Murdoch

>
>
> -----Original Message-----
> You'll have to be a little more detailed about your problem. What command
> are you running to get the diff? What are you getting back?
> What are you *expecting* back?
>
> The difference between those two fragments would usually (AKA as shown by
> diff -u) show up as a complete removal of the first block, followed by an
> addition of the whole second block. If that's not what you're diffing,
> you'll need to tell us.
>
> -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 Fri Mar 30 01:11: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.