svn capture conflict messages in svn merge dry-run or svn merge non-interactive mode.

2018-04-06 Thread Kaptaan
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

Re: svn capture conflict messages in svn merge dry-run or svn merge non-interactive mode.

2018-04-06 Thread Stefan Sperling
On Fri, Apr 06, 2018 at 09:19:46AM -0400, Kaptaan wrote: > 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-inte

[ANNOUNCE] Apache Subversion 1.10.0-rc2 released

2018-04-06 Thread Julian Foad
I'm happy to announce the release of Apache Subversion 1.10.0-rc2. Please choose the mirror closest to you by visiting: http://subversion.apache.org/download.cgi#pre-releases The SHA1 checksums are: 8d79006f0ae53536d7c1d28bbf86f677042f3e9b subversion-1.10.0-rc2.tar.bz2 44d224ad63f3bd

Re: svn capture conflict messages in svn merge dry-run or svn merge non-interactive mode.

2018-04-06 Thread Kaptaan
Thanks Stefan. The command is svn status :-) I will script something around this to show tgis information and revert. Thanks, Amit Katekar. Sent from ProtonMail mobile Original Message On Apr 6, 2018, 8:38 AM, Stefan Sperling wrote: > On Fri, Apr 06, 2018 at 09:19:46AM -0400