Unresolvable conflicts?????

I am running a Subversion 1.4 repository (because Redhat 5 supplied only svn at release 1.4) and accessing it with a 1.6 client (because that's the current release level supplied by Mac OS X). I have a PROD branch and a DEV branch in the repository, and whenever I do a merge from PROD to DEV (to keep abreast of changes in PROD) I invariably get conflicts with binaries, and tree conflicts. Sometimes the binary conflicts can be resolved by manually copying over the corresponding binaries from PROD, other times they cannot. I don't know what's causing the tree conflict in my current case (since the directories are identical) and every explanation I've seen on the web isn't useful since they all seem to assume that the version of the client and the version of the repository are the same (and usually are 1.6). Further, the recommended solutions and informative commands don't seem to work or indicate any further information on why Subversion thinks there's a conflict in the first place.

Are there any good documents (I've read the 1.4 and 1.6 subversion books already) out on the web somewhere that might address problems like these along with possible solutions? (In particular I have no idea why I'm still getting binary conflicts when the binaries in PROD and DEV are exactly the same (after copying) ).
Received on 2011-03-03 16:48:06 CET