subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Kaptaan <kapt...@protonmail.com>
Subject Re: svn capture conflict messages in svn merge dry-run or svn merge non-interactive mode.
Date Fri, 06 Apr 2018 14:22:35 GMT
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, 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