Stefan Sperling wrote:
>> [[[
>>
>> Modified the message in accordance to the desc1 of Issue #3207.
>>
>> * subversion/libsvn_client/delete.c:
>> (find_undeletables): Added "; use svn revert to undo them"
>
> This string comes from the library. 'svn revert' does not make
> sense in the context of the library, because it is specific to
> the svn command line client. This message won't make sense in
> e.g. TortoiseSVN.
>
Point taken.
> I'd suggest something like this instead (untested) to address
> issue #3207:
>
> Index: subversion/svn/util.c
> ===================================================================
> --- subversion/svn/util.c (revision 36954)
> +++ subversion/svn/util.c (working copy)
> @@ -886,7 +886,8 @@ svn_cl__may_need_force(svn_error_t *err)
> /* Should this svn_error_compose a new error number? Probably not,
> the error hasn't changed. */
> err = svn_error_quick_wrap
> - (err, _("Use --force to override this restriction") );
> + (err, _("Use --force to override this restriction (local modifications "
> + "may be lost)"));
This part, I would understand.
> && status->prop_status != svn_wc_status_normal))
> return svn_error_createf(SVN_ERR_CLIENT_MODIFIED, NULL,
> - _("'%s' has local modifications"),
> + _("'%s' has local modifications, revert them "
> + "first"),
> svn_path_local_style(path, pool));
This part, I was wondering if it would be even more clearer if we made
the user aware that they can revert or commit the changes?
Btw, I've been meaning to ask. Regarding the "_(" part, I don't
quite understand what this does.
Any clarifications appreciated.
Edmund
PS: I'm just using a different e-mail address as this one is
associated with a 'proper' username (e_wong) as opposed to
"crazycat". I hope it's ok.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1527394
Received on 2009-04-03 03:48:51 CEST