[PATCH] Suppress conflict resolver in dry-run merge

From: Jonathan Guy <jonathan.guy_at_ikoder.com>
Date: Tue, 30 Oct 2018 18:39:49 +0000

[[[
*subversion/svn/merge-cmd.c
(svn_cl__merge): Suppress the interactive conflict resolver
if a merge has been performed with the dry-run option.
]]]

application/octet-stream attachment: merge-cmd.c.patch

Received on 2018-10-30 19:40:09 CET

This message: [ Message body ]
Next message: Ruediger Pluem: "Re: svn commit: r1845204 - in /subversion/trunk/subversion: mod_authz_svn/mod_authz_svn.c mod_dav_svn/mod_dav_svn.c"
Previous message: Daniel Shahaf: "Re: svn commit: r1845204 - in /subversion/trunk/subversion: mod_authz_svn/mod_authz_svn.c mod_dav_svn/mod_dav_svn.c"
Next in thread: Stefan Sperling: "Re: [PATCH] Suppress conflict resolver in dry-run merge"
Reply: Stefan Sperling: "Re: [PATCH] Suppress conflict resolver in dry-run merge"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]