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

Diff incorrect detects complete file different

From: Greg Irvine <greg.irvine_at_thalesatm.com>
Date: 2005-04-13 08:58:17 CEST

I'm having an issue while attempting to merge between branches.

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.


I have the same problem when doing the merge on linux, windows and within


I'm using subversion 1.1.1 on fedora core 2.


This is making it extremely difficult for me to merge at all because it does
this for most (not all) files.


Thanks for any advice.



Received on Wed Apr 13 09:00:32 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.