Guten Tag Kamal Ahmed, am Samstag, 1. Februar 2014 um 09:46 schrieben Sie: > When I do a diff $REPO1/file $REPO2/file, svn diff $REPO1/file > $REPO2/file or do the same diff operation with the minified version > of the same file, I get no differences.
Sounds like you are comparing both files @HEAD. > But, when I do an svn merge $REPO2, while in the $REPO1 fresh > checked out directory, I get an svn conflict. I suspect one of the merged revisions produces the conflict, meaning that on the way to HEAD of $REPO2 and identical contents of your files like tested before, there is a conflicting situation which needs to be resolved. As you already know the result, you can simply accept the merge. > Does subversion treat minified files differently when merging? No. > Or > is there a switch which I can use ONLY for minified JavaScript files which > are being merged ? No and there's no need to because SVN doesn't care or know about JS or not. > kahmed@vm-devqa04 > /extra/co/www/developer/MERGE-8.2-to-8.3/build_8.3 $ svn merge > https://svn.hq.co.corp/co/perlapp/branches/build_8.2 > --- Merging r262219 through r264152 into 'htdocs': You can merge smaller ranges to see which version produces the conflict and have a look at the diff on why it conflicts. > svn --version > svn, version 1.6.11 (r934486) > compiled Apr 11 2013, 16:13:51 You may consider an upgrade, merge handling has improved in the more current versions. Mit freundlichen Grüßen, Thorsten Schöning -- Thorsten Schöning E-Mail:thorsten.schoen...@am-soft.de AM-SoFT IT-Systeme http://www.AM-SoFT.de/ Telefon...........05151- 9468- 55 Fax...............05151- 9468- 88 Mobil..............0178-8 9468- 04 AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow
