RE: Merge and Diff problem

> I try to mantain a vendor branch, but im facing problems with svn diff
> first and now with merge.
> I have a sql file in my trunk were i make changes, after some time the
> vendor code was upgrade,
> i give a svn diff to see the difference between the new and the old
> and wat i get was the old code
> in the begining and the new at the end, i ask in IRC and they give-me
> a solution that not work 100%
> but is ok that is,
>
> svn diff --extensions --ignore-eol-style
>
> I see clear the diferences, but now i was trying to merge the vendor
> code to my trunk and problem is
> back in a form of conflict, he replicate the content of the file, all
> new code was post at the end,
> were i fail ?

Check the properties of the .sql file and make sure it isn't set to a binary mime type. If it was generated by SQL Server tools svn always seems to think it is a binary file. Whenever we add .sql files that were generated we always need to manually remove the mime-type property before commiting.

BOb
 
Received on 2010-05-20 18:10:35 CEST