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

Re: Diff Question.

From: Gavin 'Beau' Baumanis <gavin_at_thespidernet.com>
Date: Mon, 8 Sep 2008 20:58:20 +1000

Hi Ryan,

That seems to have worked!

I assume it is the -b as opposed to the -w that did it?

I.e. -w was too relaxed an option?

Thanks again!

Beau!

On 08/09/2008, at 7:16 PM, Ryan Schmidt wrote:

> On Sep 5, 2008, at 8:05 PM, Gavin 'Beau' Baumanis wrote:
>
>> On 06/09/2008, at 10:27 AM, Ryan Schmidt wrote:
>>
>>> On Sep 5, 2008, at 12:40 AM, Gavin 'Beau' Baumanis wrote:
>>>
>>>> I was just wondering how others coped when trying to compare two
>>>> revisions of a file, but diff (whether it be a GUI-tool or "svn
>>>> diff" shows the entire document as being 1 big difference?
>>>
>>> And why does the diff tool do that?
>>>
>>> One reason is differing line endings. If so, then convert the one
>>> version of the document to the same line ending style as the other
>>> version and compare again.
>>>
>>> Or you can use the "ignore whitespace" option to diff.
>>>
>>> If your files differ on every line for a reason other than
>>> whitespace, please explain.
>>
>> I have tried the following, but it still returns the entire file as
>> being different, is there something obvious I am missing?
>>
>> svn diff /svn/trunk/project/filename.cfm -r head:2136 -x --ignore-
>> eol-style -x -w
>>
>> I even tried using the repository instead of the local WC, but it
>> returned the same.
>>
>> svn diff http://192.168.10.95/svn/trunk/project/filename.cfm -r
>> head:2136 -x --ignore-eol-style -x -w
>
> Try:
>
> svn diff /svn/trunk/project/filename.cfm -r head:2136 --diff-cmd
> diff -x -ub
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: users-help_at_subversion.tigris.org
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-09-08 12:58:50 CEST

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.