Concerning Re: incorrect diff / merge
Duncan Murdoch wrote on 29 Mar 2007, 19:11, at least in part:
> 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.
Or try WinDiff. I think ver. 2.6 (current) has a setting for character-
based diff display, otherwise one can hit F4 and the actual
(multiple) diffs in a line are selected one by by one.
http://sourceforge.net/projects/winmerge
Here are the commandlines I use with TortoiseSVN for external Diff
Viewer and Merge Tool resp.:
E:\PRG\Tools\WinMerge\WinMergeU.exe -e -x -ub -dl %yname -dr %bname %mine -wr %base
E:\PRG\Tools\WinMerge\WinMergeU.exe -e -x -ub -dl %yname -dr %tname %mine -wr %theirs %merged
Check WinMerge help to find out if character-based diffs are a
setting within Winmerge or could be set by commandline switches
(and what the above mean; part of them are TSVN switches BTW.
>
> 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
>
---------------------------------------
Freedom quote:
We do not move forward by curtailing people's liberty
because we are afraid of what they may do or say.
-- Eleanor Roosevelt, The Nation, 1940
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 30 09:09:01 2007