diff options
Diffstat (limited to 'subversion/svn/blame-cmd.c')
| -rw-r--r-- | subversion/svn/blame-cmd.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/subversion/svn/blame-cmd.c b/subversion/svn/blame-cmd.c index e198178..174a199 100644 --- a/subversion/svn/blame-cmd.c +++ b/subversion/svn/blame-cmd.c @@ -203,11 +203,11 @@ blame_receiver(void *baton, we may need to adjust this. */ if (merged_revision < revision) { - SVN_ERR(svn_stream_printf(out, pool, "G ")); + SVN_ERR(svn_stream_puts(out, "G ")); use_merged = TRUE; } else - SVN_ERR(svn_stream_printf(out, pool, " ")); + SVN_ERR(svn_stream_puts(out, " ")); } if (use_merged) @@ -283,7 +283,7 @@ svn_cl__blame(apr_getopt_t *os, if (! opt_state->xml) SVN_ERR(svn_stream_for_stdout(&bl.out, pool)); else - bl.sbuf = svn_stringbuf_create("", pool); + bl.sbuf = svn_stringbuf_create_empty(pool); bl.opt_state = opt_state; @@ -375,10 +375,13 @@ svn_cl__blame(apr_getopt_t *os, { svn_error_clear(err); SVN_ERR(svn_cmdline_fprintf(stderr, subpool, - _("Skipping binary file: '%s'\n"), + _("Skipping binary file " + "(use --force to treat as text): " + "'%s'\n"), target)); } else if (err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND || + err->apr_err == SVN_ERR_ENTRY_NOT_FOUND || err->apr_err == SVN_ERR_FS_NOT_FILE || err->apr_err == SVN_ERR_FS_NOT_FOUND) { |