aboutsummaryrefslogtreecommitdiffstats
path: root/subversion/svn
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2014-02-20 19:26:10 +0000
committerPeter Wemm <peter@FreeBSD.org>2014-02-20 19:26:10 +0000
commit219f5ebf8fca3572d8d4265d78d0e4670ca35a27 (patch)
treee6232088e2faabbf0f1a6e568df3285323f27c5c /subversion/svn
parenteeb88685bfa4ef1c0639f1136d83ff19de1b4595 (diff)
downloadsrc-219f5ebf8fca3572d8d4265d78d0e4670ca35a27.tar.gz
src-219f5ebf8fca3572d8d4265d78d0e4670ca35a27.zip
Vendor import svn-1.8.8vendor/subversion/subversion-1.8.8
Notes
Notes: svn path=/vendor/subversion/dist/; revision=262248 svn path=/vendor/subversion/subversion-1.8.8/; revision=262249; tag=vendor/subversion/subversion-1.8.8
Diffstat (limited to 'subversion/svn')
-rw-r--r--subversion/svn/conflict-callbacks.c4
-rw-r--r--subversion/svn/status-cmd.c3
-rw-r--r--subversion/svn/svn.c4
3 files changed, 8 insertions, 3 deletions
diff --git a/subversion/svn/conflict-callbacks.c b/subversion/svn/conflict-callbacks.c
index d5a98ddf6fbb..3d41ecf93670 100644
--- a/subversion/svn/conflict-callbacks.c
+++ b/subversion/svn/conflict-callbacks.c
@@ -489,10 +489,10 @@ static const resolver_option_t text_conflict_options[] =
/* Resolver options for a property conflict */
static const resolver_option_t prop_conflict_options[] =
{
- { "mf", N_("my version"), N_("accept my version of entire file (even "
+ { "mf", N_("my version"), N_("accept my version of entire property (even "
"non-conflicts) [mine-full]"),
svn_wc_conflict_choose_mine_full },
- { "tf", N_("their version"), N_("accept their version of entire file "
+ { "tf", N_("their version"), N_("accept their version of entire property "
"(same) [theirs-full]"),
svn_wc_conflict_choose_theirs_full },
{ "dc", N_("display conflict"), N_("show conflicts in this property"), -1 },
diff --git a/subversion/svn/status-cmd.c b/subversion/svn/status-cmd.c
index 12edd8e42a4e..9840cd2bd5eb 100644
--- a/subversion/svn/status-cmd.c
+++ b/subversion/svn/status-cmd.c
@@ -358,7 +358,8 @@ svn_cl__status(apr_getopt_t *os,
NULL, opt_state->quiet,
/* not versioned: */
SVN_ERR_WC_NOT_WORKING_COPY,
- SVN_ERR_WC_PATH_NOT_FOUND));
+ SVN_ERR_WC_PATH_NOT_FOUND,
+ SVN_NO_ERROR));
if (opt_state->xml)
SVN_ERR(print_finish_target_xml(repos_rev, iterpool));
diff --git a/subversion/svn/svn.c b/subversion/svn/svn.c
index 7ed7ed22041a..52760dd1eb24 100644
--- a/subversion/svn/svn.c
+++ b/subversion/svn/svn.c
@@ -2939,6 +2939,10 @@ sub_main(int argc, const char *argv[], apr_pool_t *pool)
"Subversion"));
}
+ /* Ensure that stdout is flushed, so the user will see any write errors.
+ This makes sure that output is not silently lost. */
+ err = svn_error_compose_create(err, svn_cmdline_fflush(stdout));
+
return EXIT_ERROR(err);
}
else