[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 6 Apr 2018 15:38:04 +0200

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.
Received on 2018-04-06 15:38:25 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.