Geek Answers Handbook

SVN marks entire files as conflicting

I am new to SVN. After working on a branch for a day or so, I tried to merge the changes from trunk to branch:

svn merge svn://server/trunk

The problem is that whenever an SVN encounters a conflicting file, it cannot recognize line-by-line changes and notes that the entire line is conflicting. I experimented with several other SVN clients, and also tried to switch the parameters of the final and white areas without any success. What am I doing wrong? I think this is the easiest merge case possible, so I expect it to work with most of the default Subversion settings, any client, and any SVN version. Is this some famous newbie?

Client: 1.5.5 (SlikSvn: tag / 1.5.5@34877 ) WIN32

Server: 1.4.6 (r28521), windows

Edit

Based on the suggestions in the comments and answers below, I did more research:

  • The problematic files are UTF8.

  • They have no SVN properties.

  • The svn diff command correctly identifies the differences.

+5
source share
5 answers

We recently discovered this problem and found that it is a problem using the 1.4.x server and the 1.5.x client. Subversion 1.5 introduced a more intelligent merge, but you need the server and client to run 1.5 to take advantage of this.

We found that specifying the range of revision numbers that we wanted to combine gave the expected results.

+5
source

. . , SVN 1.4, 1.5. , , SVN ( , ):

svn merge svn://dpr/branches/abc@REV svn://dpr/trunk@REV

, , SVN , , , 1.5, . " " SVN ( , ).

+2

TortoiseSVN? ToroiseMerge, , , .

0

SVN , eclipse, , , ( ), , ( eclipse / ), , , , .

0

svn: mime-type . 'text/', Subversion , .

If your files are encoded in utf-16, Subversion will also treat these files as binary by default.

0
source

More articles:


All Articles