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

svn merge/diff problem

From: Filip Defoort <filip_at_cirquedigital.com>
Date: 2004-03-25 09:33:13 CET

Hi,

When doing svn merge, the generated diff seems to be incorrect, best to
illustrate with a small example:

File.A:
this
is
a
test

File.B:
this
is
not
a
test

As the diff I'm getting,

>>>>>>
this
is
a
test
----------
this
is
not
a
test
<<<<<<<

Where I would have expected to get:

this
is
>>>>>>
----------
not
<<<<<<<
a
test

This happens all the time, and the differences between the files are
usually pretty trivial, so
it must be something in my installation / tools that I'm overlooking...

This makes the merging of course very difficult.. The strange thing is
that simply executing cygwin's
external diff command, creates the correct diffs... I'm running
subversion 1.0 on cygwin / windows xp (client)
and SuSE 9 on the server side..

Anybody any ideas where I can look to nail this problem down? I'll have
to start merging
lots of branches soon :-(

Thanks in advance!
- Filip

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 25 09:33:52 2004

This is an archived mail posted to the Subversion Users mailing list.