subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Sperling <s...@elego.de>
Subject Re: svn capture conflict messages in svn merge dry-run or svn merge non-interactive mode.
Date Fri, 06 Apr 2018 13:38:04 GMT
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-interactive mode?
> 
> Or any other command to achieve the same result?

If you run 'svn info' on a conflicted path it should show this information.

Mime
View raw message