Diff incorrect detects complete file different

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
subclipse.

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.

Greg.

 
Received on Wed Apr 13 09:00:32 2005