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

RE: Diff incorrect detects complete file different

From: Greg Irvine <greg.irvine_at_thalesatm.com>
Date: 2005-04-14 05:55:55 CEST

If I do a simple svn diff it correctly shows only the differences between
the latest versions of the file in the two branches (I have checked out

If I try and merge changes between version 1 and 20 of one branch into the
second branch, it thinks the full file has changed and it's all screwy.

I can only think that at some stage I've delivered the file with different
EOL character set (^M instead of \r\n or something) and merge is not
correctly matching them.

Exceptionally frustrating.


-----Original Message-----
From: Peter N. Lundblad [mailto:peter@famlundblad.se]
Sent: Wednesday, 13 April 2005 5:18 PM
To: Greg Irvine
Cc: users@subversion.tigris.org
Subject: Re: Diff incorrect detects complete file different

On Wed, 13 Apr 2005, Greg Irvine wrote:

> The merging is detecting that the full contents of two files is different.
> i.e. it's showing the entire contents of the working file between "<<<<
> .working" and the "====== " and the incoming file after to the trailing
> ">>>>>".
> If I divide the two sections into two files and run a diff on that (unix
> diff command), it correctly only shows the line by line differences.
> I've ensured the files are both using unix end-of-lines.
And you're sure there a not just whitespace differences (or tabs being
converted to spaces or something)?
> Thanks for any advice.
Could you send small example files where this happens? You need to send
all three versions fof the file.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Apr 14 05:57:51 2005

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.