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.
But, when I do an svn merge $REPO2, while in the $REPO1 fresh checked out directory, I get an svn conflict. Does subversion treat minified files differently when merging? Or is there a switch which I can use ONLY for minified JavaScript files which are being merged ? kahmed@vm-devqa04 /extra/cr/www/developer $ diff build_8.3/htdocs/javascript/retro_audit.js build_8.2/htdocs/javascript/retro_audit.js kahmed@vm-devqa04 /extra/co/www/developer $ diff build_8.3/htdocs/javascript/retro_audit.min.js build_8.2/htdocs/javascript/retro_audit.min.js kahmed@vm-devqa04 /extra/co/www/developer $ 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': C htdocs/css/sass/sass_compile_ca.sh Conflict discovered in 'htdocs/javascript/retro_audit.min.js'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: plus as you can notice, that there is conflict identified for htdocs/css/sass/sass_compile_ca.sh, but the option to resolve it is not offered by svn subversion version = svn --version svn, version 1.6.11 (r934486) compiled Apr 11 2013, 16:13:51 on centos 6.2 Thanks, -Kamal.
