Re: svn commit: r33620 - in trunk/subversion: include libsvn_client libsvn_wc svn svn/schema tests/cmdline

[Julian Foad <ju...@btopenworld.com>]

Arfrever Frehtes Taifersar Arahesis wrote:
> 2008-10-13 23:56 <ju...@tigris.org> napisał(a):

> > Modified: trunk/subversion/svn/info-cmd.c
> > URL: http://svn.collab.net/viewvc/svn/trunk/subversion/svn/info-cmd.c?pathrev=33620&r1=33619&r2=33620
> > ==============================================================================
> > --- trunk/subversion/svn/info-cmd.c     Mon Oct 13 12:32:20 2008        (r33619)
> > +++ trunk/subversion/svn/info-cmd.c     Mon Oct 13 14:56:30 2008        (r33620)
> > @@ -85,10 +85,8 @@ print_info_xml(void *baton,
> >  /* If revision is invalid, assume WC is corrupt. */
> 
> This comment should be updated.

Thanks. I see that Steve Butler has fixed this and the two things you
mention below.

> >   if (SVN_IS_VALID_REVNUM(info->rev))
> >     rev_str = apr_psprintf(pool, "%ld", info->rev);
> >   else
> > -    return svn_error_createf(SVN_ERR_WC_CORRUPT, NULL,
> > -                             _("'%s' has invalid revision"),
> > -                             svn_path_local_style(target, pool));
> > +    rev_str = apr_pstrdup(pool, "Resource is not under version control.");
> 
> This string probably should be marked for translation:
> _("Resource is not under version control.")

However, I'm not sure we really want to put this string in the XML
output at all. Would 'revision="0"' better? The case we're trying to
describe here is when reporting info on a path that doesn't exist in the
WC, probably because it was deleted in this branch, and the incoming
change (from a merge) is trying to delete this path.


> > -      if (tree_conflict_descs->len > 0)
> > -        {
> > -          svn_cmdline_printf(pool, "Tree conflicts:%s",
> > -                             tree_conflict_descs->data);
> > -        }
> > +      svn_cmdline_printf(pool, "Tree conflicts:\n%s", desc->data);
> 
> "Tree conflicts:\n%s" should be marked for translation.

Yes.

Also, I've now changed that string to say "conflict" not "conflicts"
because it can now print only one.

- Julian



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org