I am using svn 1.8.17 as my svn client on RHEL 6.1. I am trying to automate some of the merge functions. During the dryrun operation, I do get some tree conflict messages, which is fine, but I would like to show the reason of the tree conflict in the dry-run so the developers know why there is a conflict and what steps they should take.
svn merge $UAT_PROJECTS_SVNREP . -c105914 --dry-run --- Merging r105914 into '.': C src/app/cobol/batch/AE0010I2.pco C src/app/cobol/batch/AKCALACU.cbl C src/app/cobol/batch/SMTEST1 C src/app/cobol/batch/SMTEST2 C src/app/cobol/copybook/AK1 Summary of conflicts: Tree conflicts: 5 However, it does not say why the tree conflict is there. e.g. when I do the actual merge svn merge $UAT_PROJECTS_SVNREP . -c105914 Tree conflict on 'src/app/cobol/batch/AE0010I2.pco' > local file missing, incoming file delete upon merge Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help: p Tree conflict on 'src/app/cobol/batch/AKCALACU.cbl' > local file obstruction, incoming file add upon merge Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help: p Tree conflict on 'src/app/cobol/batch/SMTEST1' > local file obstruction, incoming file add upon merge Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help: p Tree conflict on 'src/app/cobol/batch/SMTEST2' > local file obstruction, incoming file add upon merge Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help: p Tree conflict on 'src/app/cobol/copybook/AK1' > local file obstruction, incoming file add upon merge Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help: p I dont see these messages "> local file obstruction, incoming file add upon merge" if I use the merge in a non-interactive mode, say through a script or a cron job. I would like to see the message "> Local file obstruction, incoming file add upon merge" during the dryrun option. Is there anyway we can have the reason of the conflict show in a dry-run or even in the actual merge in the non-interactive mode? Or any other command to achieve the same result? Thanks, Amit Katekar. Sent with [ProtonMail](https://protonmail.com) Secure Email.
