You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2011/11/17 12:31:17 UTC
svn commit: r1203157 -
/subversion/branches/showing-merge-info/subversion/svn/merge-cmd.c
Author: julianfoad
Date: Thu Nov 17 11:31:16 2011
New Revision: 1203157
URL: http://svn.apache.org/viewvc?rev=1203157&view=rev
Log:
On the 'showing-merge-info' branch: Don't print the keep-alive message if
the merge failed.
* subversion/svn/merge-cmd.c
(svn_cl__merge): As above.
Modified:
subversion/branches/showing-merge-info/subversion/svn/merge-cmd.c
Modified: subversion/branches/showing-merge-info/subversion/svn/merge-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/showing-merge-info/subversion/svn/merge-cmd.c?rev=1203157&r1=1203156&r2=1203157&view=diff
==============================================================================
--- subversion/branches/showing-merge-info/subversion/svn/merge-cmd.c (original)
+++ subversion/branches/showing-merge-info/subversion/svn/merge-cmd.c Thu Nov 17 11:31:16 2011
@@ -342,14 +342,15 @@ svn_cl__merge(apr_getopt_t *os,
targetpath,
opt_state->dry_run,
options, ctx, pool);
-
+
/* Tell the user how to keep the source branch alive. */
- {
- const char *tgt_repos_relpath;
+ if (! err)
+ {
+ const char *tgt_repos_relpath;
- SVN_ERR(get_repos_relpath(&tgt_repos_relpath, targetpath, ctx, pool));
- printf(_(keep_alive_message), tgt_repos_relpath);
- }
+ SVN_ERR(get_repos_relpath(&tgt_repos_relpath, targetpath, ctx, pool));
+ printf(_(keep_alive_message), tgt_repos_relpath);
+ }
}
else if (! two_sources_specified)
{