[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: Sat, 6 Sep 2008 11:05:31 +1000

Hi Ryan (and everyone else of course)

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

Index: filename.cfm
===================================================================
--- filename.cfm (revision 3885)
+++ filename.cfm (revision 2136)
@@ -1,710 +1,726 @@

Gavin.

It's always darkest before the dawn. So if you're going to steal your
neighbour's paper - then that's the time to do it.

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.
>
>
> ---------------------------------------------------------------------
> 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-06 03:06:42 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.