On Thu, Apr 02, 2009 at 05:35:47PM +0800, Edmund Wong wrote:
> Hi,
>
> This is a quick patch to 'satisfy' issue #3207. Credit goes to
> Braden Anderson.
>
> [[[
>
> 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.
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)"));
}
return err;
Index: subversion/libsvn_client/delete.c
===================================================================
--- subversion/libsvn_client/delete.c (revision 36954)
+++ subversion/libsvn_client/delete.c (working copy)
@@ -64,7 +64,8 @@ find_undeletables(void *baton,
(status->prop_status != svn_wc_status_none
&& 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));
return SVN_NO_ERROR;
Stefan
Received on 2009-04-02 23:42:29 CEST