You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by David Glasser <gl...@davidglasser.net> on 2007/10/25 23:49:51 UTC
Re: svn commit: r27387 - trunk/subversion/libsvn_wc
Hi nori. The strings in props.c are not error messages: they are
conflict messages written to *.prej files. I think periods are OK
there. In any case, this change broke a few of the merge_tests. I
reverted the props.c part in r27406.
--dave
On 10/25/07, nori@tigris.org <no...@tigris.org> wrote:
> Author: nori
> Date: Thu Oct 25 12:31:30 2007
> New Revision: 27387
>
> Log:
> Kill trailing periods to meet our error message conventions.
>
>
> Modified:
> trunk/subversion/libsvn_wc/adm_ops.c
> trunk/subversion/libsvn_wc/props.c
> trunk/subversion/libsvn_wc/update_editor.c
>
> Modified: trunk/subversion/libsvn_wc/adm_ops.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/adm_ops.c?pathrev=27387&r1=27386&r2=27387
> ==============================================================================
> --- trunk/subversion/libsvn_wc/adm_ops.c (original)
> +++ trunk/subversion/libsvn_wc/adm_ops.c Thu Oct 25 12:31:30 2007
> @@ -1977,7 +1977,7 @@
>
> /* Safeguard 1: is this a versioned resource? */
> SVN_ERR_W(svn_wc__entry_versioned(&entry, path, dir_access, FALSE, pool),
> - _("Cannot revert."));
> + _("Cannot revert"));
>
> /* Safeguard 1.5: is this a missing versioned directory? */
> if (entry->kind == svn_node_dir)
> @@ -2935,7 +2935,7 @@
> svn_error_t *unversioned_err =
> svn_error_createf(SVN_ERR_CLIENT_IS_DIRECTORY, NULL,
> _("'%s' is a directory, and thus cannot"
> - " be a member of a changelist."),
> + " be a member of a changelist"),
> path);
> notify = svn_wc_create_notify(path,
> svn_wc_notify_changelist_failed,
>
> Modified: trunk/subversion/libsvn_wc/props.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/props.c?pathrev=27387&r1=27386&r2=27387
> ==============================================================================
> --- trunk/subversion/libsvn_wc/props.c (original)
> +++ trunk/subversion/libsvn_wc/props.c Thu Oct 25 12:31:30 2007
> @@ -1489,7 +1489,7 @@
> *conflict = svn_string_createf
> (pool,
> _("Trying to add new property '%s' with value "
> - "'%s',\nbut property already exists with value '%s'."),
> + "'%s',\nbut property already exists with value '%s'"),
> propname, new_val->data, working_val->data);
> }
> }
> @@ -1504,7 +1504,7 @@
> if (got_conflict)
> *conflict = svn_string_createf
> (pool, _("Trying to create property '%s' with value '%s',\n"
> - "but it has been locally deleted."),
> + "but it has been locally deleted"),
> propname, new_val->data);
> }
> else /* property doesn't yet exist in working_props... */
> @@ -1577,8 +1577,8 @@
> if (got_conflict)
> *conflict = svn_string_createf
> (pool,
> - _("Trying to delete property '%s' with value '%s'\n"
> - "but it has been modified from '%s' to '%s'."),
> + _("Trying to delete property '%s' with value '%s',\n"
> + "but it has been modified from '%s' to '%s'"),
> propname, old_val->data,
> base_val->data, working_val->data);
> }
> @@ -1598,8 +1598,8 @@
> if (got_conflict)
> *conflict = svn_string_createf
> (pool,
> - _("Trying to delete property '%s' with value '%s'\n"
> - "but the local value is '%s'."),
> + _("Trying to delete property '%s' with value '%s',\n"
> + "but the local value is '%s'"),
> propname, base_val->data, working_val->data);
> }
>
> @@ -1687,7 +1687,7 @@
> (pool,
> _("Trying to change property '%s' from '%s' to '%s',\n"
> "but property has been locally changed "
> - "from '%s' to '%s'."),
> + "from '%s' to '%s'"),
> propname, old_val->data, new_val->data,
> base_val->data, working_val->data);
> else
> @@ -1715,7 +1715,7 @@
> *conflict = svn_string_createf
> (pool,
> _("Trying to change property '%s' from '%s' to '%s',\n"
> - "but it has been locally deleted."),
> + "but it has been locally deleted"),
> propname, old_val->data, new_val->data);
> }
> }
> @@ -1749,7 +1749,7 @@
> *conflict = svn_string_createf
> (pool,
> _("Trying to change property '%s' from '%s' to '%s',\n"
> - "but the property does not exist."),
> + "but the property does not exist"),
> propname, old_val->data, new_val->data);
> }
> }
> @@ -1787,7 +1787,7 @@
> *conflict = svn_string_createf
> (pool,
> _("Trying to change property '%s' from '%s' to '%s',\n"
> - "but property already exists with value '%s'."),
> + "but property already exists with value '%s'"),
> propname, old_val->data, new_val->data,
> working_val->data);
> }
>
> Modified: trunk/subversion/libsvn_wc/update_editor.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/update_editor.c?pathrev=27387&r1=27386&r2=27387
> ==============================================================================
> --- trunk/subversion/libsvn_wc/update_editor.c (original)
> +++ trunk/subversion/libsvn_wc/update_editor.c Thu Oct 25 12:31:30 2007
> @@ -1948,7 +1948,7 @@
> /* Sanity checks */
> if (! (copyfrom_path && SVN_IS_VALID_REVNUM(copyfrom_rev)))
> return svn_error_create(SVN_ERR_WC_INVALID_OP_ON_CWD, NULL,
> - _("Bad copyfrom arguments received."));
> + _("Bad copyfrom arguments received"));
>
> return add_file_with_history(path, parent_baton,
> copyfrom_path, copyfrom_rev,
> @@ -2956,7 +2956,7 @@
> if ((! dest_entry->repos) || (! dest_entry->url))
> return svn_error_create(SVN_ERR_WC_COPYFROM_PATH_NOT_FOUND, NULL,
> _("Destination directory of add-with-history "
> - "is missing a URL."));
> + "is missing a URL"));
>
> svn_path_split(copyfrom_path, ©from_parent, ©from_file, pool);
> SVN_ERR(svn_path_get_absolute(&abs_dest_dir, dest_dir, pool));
> @@ -2970,7 +2970,7 @@
> dest_fs_path = ""; /* the urls are identical; that's ok. */
> else
> return svn_error_create(SVN_ERR_WC_COPYFROM_PATH_NOT_FOUND, NULL,
> - _("Destination URLs are broken."));
> + _("Destination URLs are broken"));
> }
> dest_fs_path = apr_pstrcat(pool, "/", dest_fs_path, NULL);
> dest_fs_path = svn_path_canonicalize(dest_fs_path, pool);
> @@ -3211,7 +3211,7 @@
>
> if (! eb->fetch_func)
> return svn_error_create(SVN_ERR_WC_INVALID_OP_ON_CWD, NULL,
> - _("No fetch_func supplied to update_editor."));
> + _("No fetch_func supplied to update_editor"));
>
> /* Fetch the repository file's text-base and base-props;
> svn_stream_close() automatically closes the text-base file for us. */
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org
>
>
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r27387 - trunk/subversion/libsvn_wc
Posted by Kobayashi Noritada <no...@dolphin.c.u-tokyo.ac.jp>.
Hi David,
From: "David Glasser"
Subject: Re: svn commit: r27387 - trunk/subversion/libsvn_wc
Date: Thu, 25 Oct 2007 16:49:51 -0700
> Hi nori. The strings in props.c are not error messages: they are
> conflict messages written to *.prej files. I think periods are OK
> there. In any case, this change broke a few of the merge_tests. I
> reverted the props.c part in r27406.
Sorry, I was not enough careful... Thank you for reverting.
Regards,
-nori
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org