RE: Merge and Diff problem

2010-05-20 Thread Bob Archer
> 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

Merge and Diff problem

2010-05-20 Thread Debiminho
Hi, 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