This time I'm quite satisfied. Although it can always be better.
Any objections? If not I'll commit in a few days.
bye,
Erik.
Log:
[[[
Change error messages cf issue 897 on library by library basis;
this time: libsvn_wc.
* subversion/libsvn_wc/relocate.c
* subversion/libsvn_wc/props.c
* subversion/libsvn_wc/entries.c
* subversion/libsvn_wc/copy.c
* subversion/libsvn_wc/util.c
* subversion/libsvn_wc/adm_crawler.c
* subversion/libsvn_wc/log.c
* subversion/libsvn_wc/adm_ops.c
* subversion/libsvn_wc/adm_files.c
* subversion/libsvn_wc/lock.c
* subversion/libsvn_wc/update_editor.c
* subversion/libsvn_wc/questions.c
* subversion/libsvn_wc/translate.c
Start with uppercase letter.
Remove function names from messages.
Shorten long messages.
Remove '--' from errors making them look more like those in libsvn_client.
Change 'unversioned resource' messages and error codes to standard
(SVN_ERR_UNVERSIONED_RESOURCE, "'%s' is not under version control").
* subversion/tests/clients/cmdline/basic_tests.py
* subversion/tests/clients/cmdline/commit_tests.py
* subversion/tests/clients/cmdline/merge_tests.py
Adjust tests for changed output.
]]]
Index: subversion/libsvn_wc/relocate.c
===================================================================
--- subversion/libsvn_wc/relocate.c (revision 7810)
+++ subversion/libsvn_wc/relocate.c (working copy)
@@ -59,11 +59,10 @@
entry = apr_hash_get (entries, base, APR_HASH_KEY_STRING);
if (! entry)
- return svn_error_create (SVN_ERR_ENTRY_NOT_FOUND, NULL,
- "missing entry");
+ return svn_error_create (SVN_ERR_ENTRY_NOT_FOUND, NULL, NULL);
if (! entry->url)
return svn_error_createf (SVN_ERR_ENTRY_MISSING_URL, NULL,
- "entry '%s' has no URL", path);
+ "Entry '%s' has no URL", path);
if (! strncmp (entry->url, from, from_len))
{
Index: subversion/libsvn_wc/props.c
===================================================================
--- subversion/libsvn_wc/props.c (revision 7810)
+++ subversion/libsvn_wc/props.c (working copy)
@@ -98,7 +98,7 @@
{
*description =
svn_string_createf
- (pool, "prop '%s': user set value to '%s', but update deletes
it.\n",
+ (pool, "Property '%s' locally changed to '%s', but update deletes
it",
local->name, local->value->data);
return TRUE; /* conflict */
}
@@ -106,7 +106,7 @@
{
*description =
svn_string_createf
- (pool, "prop '%s': user deleted, but update sets it to '%s'.\n",
+ (pool, "Property '%s' locally deleted, but update sets it to '%s'",
local->name, update->value->data);
return TRUE; /* conflict */
}
@@ -122,7 +122,8 @@
{
*description =
svn_string_createf
- (pool, "prop '%s': user set to '%s', but update set to '%s'.\n",
+ (pool, "Property '%s' locally changed to '%s', "
+ "but update sets it to '%s'",
local->name, local->value->data, update->value->data);
return TRUE; /* conflict */
}
@@ -160,15 +161,14 @@
apr_status_t status;
apr_file_t *propfile = NULL;
- SVN_ERR_W (svn_io_file_open (&propfile, propfile_path,
- APR_READ | APR_BUFFERED, APR_OS_DEFAULT,
- pool),
- "load_prop_file: can't open propfile");
+ SVN_ERR (svn_io_file_open (&propfile, propfile_path,
+ APR_READ | APR_BUFFERED, APR_OS_DEFAULT,
+ pool));
status = svn_hash_read (hash, propfile, pool);
if (status)
return svn_error_createf (status, NULL,
- "load_prop_file: can't parse '%s'",
+ "Can't parse '%s'",
propfile_path);
SVN_ERR (svn_io_file_close (propfile, pool));
@@ -189,16 +189,15 @@
apr_status_t apr_err;
apr_file_t *prop_tmp;
- SVN_ERR_W (svn_io_file_open (&prop_tmp, propfile_path,
- (APR_WRITE | APR_CREATE | APR_TRUNCATE
- | APR_BUFFERED),
- APR_OS_DEFAULT, pool),
- "save_prop_file: can't open propfile");
+ SVN_ERR (svn_io_file_open (&prop_tmp, propfile_path,
+ (APR_WRITE | APR_CREATE | APR_TRUNCATE
+ | APR_BUFFERED),
+ APR_OS_DEFAULT, pool));
apr_err = svn_hash_write (hash, prop_tmp, pool);
if (apr_err)
return svn_error_createf (apr_err, NULL,
- "save_prop_file: can't write prop hash to
'%s'",
+ "Can't write property hash to '%s'",
propfile_path);
SVN_ERR (svn_io_file_close (prop_tmp, pool));
@@ -231,9 +230,8 @@
status = apr_file_write_full (fp, conflict_description_native->data,
conflict_description_native->len,
&written);
if (status)
- return svn_error_create (status, NULL,
- "append_prop_conflict: "
- "apr_file_write_full failed.");
+ return svn_error_create (status, NULL, NULL);
+
return SVN_NO_ERROR;
}
@@ -254,7 +252,7 @@
if (! the_entry)
return svn_error_createf
(SVN_ERR_ENTRY_NOT_FOUND, NULL,
- "get_existing_reject_prop_reject_file: can't find entry '%s' in
'%s'",
+ "Can't find entry '%s' in '%s'",
name, svn_wc_adm_access_path (adm_access));
*reject_file = the_entry->prejfile
@@ -286,9 +284,8 @@
SVN_ERR (svn_wc_entry (&entry, path, adm_access, FALSE, pool));
if (entry == NULL)
- return svn_error_createf (SVN_ERR_ENTRY_NOT_FOUND, NULL,
- "Can't merge props into '%s':"
- "it's not under version control.", path);
+ return svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
+ "'%s' is not under version control", path);
/* Notice that we're not using svn_path_split_if_file(), because
that looks at the actual working file. It's existence shouldn't
@@ -328,8 +325,7 @@
{
apr_file_close (log_fp);
return svn_error_createf (apr_err, NULL,
- "svn_wc_merge_prop_diffs:"
- "error writing log for '%s'", path);
+ "Error writing log for '%s'", path);
}
SVN_ERR (svn_wc__close_adm_file (log_fp, parent, SVN_WC__ADM_LOG,
@@ -742,12 +738,12 @@
#if 0
if (kind == svn_node_none)
return svn_error_createf (SVN_ERR_BAD_FILENAME, NULL,
- "wcprop_list: non-existent path '%s'.",
+ "'%s' does not exist",
path);
if (kind == svn_node_unknown)
return svn_error_createf (SVN_ERR_NODE_UNKNOWN_KIND, NULL,
- "wcprop_list: unknown node kind: '%s'.",
+ "Unknown node kind: '%s'",
path);
#endif
@@ -783,7 +779,7 @@
if (err)
return
svn_error_quick_wrap
- (err, "svn_wc__wcprop_get: failed to load props from disk.");
+ (err, "Failed to load properties from disk.");
*value = apr_hash_get (prophash, name, APR_HASH_KEY_STRING);
return SVN_NO_ERROR;
@@ -806,7 +802,7 @@
if (err)
return
svn_error_quick_wrap
- (err, "svn_wc__wcprop_set: failed to load props from disk.");
+ (err, "Failed to load properties from disk.");
/* Now we have all the properties in our hash. Simply merge the new
property into it. */
@@ -823,7 +819,7 @@
apr_err = svn_hash_write (prophash, fp, pool);
if (apr_err)
return svn_error_createf (apr_err, NULL,
- "can't write prop hash for '%s'", path);
+ "Cannot write property hash for '%s'", path);
/* Close file, and doing an atomic "move". */
SVN_ERR (svn_wc__close_props (fp, path, 0, 1,
@@ -893,7 +889,7 @@
{
return svn_error_createf /* we don't do entry properties here */
(SVN_ERR_BAD_PROP_KIND, NULL,
- "property '%s' is an entry property", name);
+ "Property '%s' is an entry property", name);
}
else /* regular prop */
{
@@ -901,7 +897,7 @@
if (err)
return
svn_error_quick_wrap
- (err, "svn_wc_prop_get: failed to load props from disk.");
+ (err, "Failed to load properties from disk");
*value = apr_hash_get (prophash, name, APR_HASH_KEY_STRING);
>>>>>>> .merge-right.r28
else if (prop_kind == svn_prop_entry_kind)
return svn_error_createf /* we don't do entry properties here */
(SVN_ERR_BAD_PROP_KIND, NULL,
- "property '%s' is an entry property", name);
+ "Property '%s' is an entry property", name);
/* Else, handle a regular property: */
@@ -1099,7 +1095,7 @@
if (err)
return
svn_error_quick_wrap
- (err, "svn_wc_prop_set: failed to load props from disk.");
+ (err, "Failed to load properties from disk.");
/* If we're changing this file's list of expanded keywords, then
* we'll need to invalidate its text timestamp, since keyword
@@ -1130,7 +1126,7 @@
apr_err = svn_hash_write (prophash, fp, pool);
if (apr_err)
return svn_error_createf (apr_err, NULL,
- "can't write prop hash for '%s'", path);
+ "Cannot write property hash for '%s'", path);
/* Close file, and doing an atomic "move". */
SVN_ERR (svn_wc__close_props (fp, path, 0, 0,
@@ -1542,8 +1538,8 @@
parse_error:
return svn_error_createf
(SVN_ERR_CLIENT_INVALID_EXTERNALS_DESCRIPTION, NULL,
- "error parsing " SVN_PROP_EXTERNALS " property on '%s':\n"
- "Invalid line: '%s'", parent_directory, line);
+ "Error parsing " SVN_PROP_EXTERNALS " property on '%s': '%s'",
+ parent_directory, line);
}
/* Make sure we don't have "." nor "../" in the tgt dir. */
@@ -1557,10 +1553,9 @@
|| (strncmp ((item->target_dir + tgt_dir_len - 3), "/..", 3) ==
0))
return svn_error_createf
(SVN_ERR_CLIENT_INVALID_EXTERNALS_DESCRIPTION, NULL,
- "error parsing " SVN_PROP_EXTERNALS " property on '%s':\n"
- "Invalid line: '%s'\n"
- "Target dir '%s' involves '.' or '..', which is not allowed.",
- parent_directory, line, item->target_dir);
+ "Invalid " SVN_PROP_EXTERNALS " property on '%s': "
+ "target involves '.' or '..'",
+ parent_directory);
}
item->target_dir = svn_path_canonicalize (item->target_dir, pool);
Index: subversion/libsvn_wc/entries.c
===================================================================
--- subversion/libsvn_wc/entries.c (revision 7810)
+++ subversion/libsvn_wc/entries.c (working copy)
@@ -119,8 +119,7 @@
{
apr_file_close (f);
return svn_error_createf (apr_err, NULL,
- "svn_wc__entries_init: "
- "error writing entries file for '%s'.",
+ "Error writing entries file for '%s'",
path);
}
@@ -572,17 +571,17 @@
if (! default_entry)
return svn_error_create (SVN_ERR_ENTRY_NOT_FOUND,
NULL,
- "missing default entry");
+ "Missing default entry");
if (default_entry->revision == SVN_INVALID_REVNUM)
return svn_error_create (SVN_ERR_ENTRY_MISSING_REVISION,
NULL,
- "default entry has no revision number");
+ "Default entry has no revision number");
if (! default_entry->url)
return svn_error_create (SVN_ERR_ENTRY_MISSING_URL,
NULL,
- "default entry missing URL");
+ "Default entry is missing URL");
/* Then use it to fill in missing information in other entries. */
@@ -664,13 +663,13 @@
apr_err = apr_file_read_full (infile, buf, sizeof(buf), &bytes_read);
if (apr_err && !APR_STATUS_IS_EOF(apr_err))
return svn_error_create
- (apr_err, NULL, "read_entries: apr_file_read_full choked");
+ (apr_err, NULL, NULL);
err = svn_xml_parse (svn_parser, buf, bytes_read,
APR_STATUS_IS_EOF(apr_err));
if (err)
return svn_error_createf (err->apr_err, err,
- "read_entries: XML parser failed (%s).",
+ "XML parser failed in '%s'",
svn_wc_adm_access_path (adm_access));
} while (!APR_STATUS_IS_EOF(apr_err));
@@ -1165,7 +1164,7 @@
apr_err = apr_file_write_full (outfile, bigstr->data, bigstr->len, NULL);
if (apr_err)
err = svn_error_createf (apr_err, NULL,
- "svn_wc__entries_write: %s",
+ "Error writing to '%s'",
svn_wc_adm_access_path (adm_access));
else
err = svn_wc__close_adm_file (outfile,
@@ -1364,10 +1363,7 @@
return SVN_NO_ERROR;
default:
- return
- svn_error_createf
- (SVN_ERR_WC_SCHEDULE_CONFLICT, NULL,
- "fold_state_changes: Illegal schedule in state set
operation");
+ return svn_error_createf (SVN_ERR_WC_SCHEDULE_CONFLICT, NULL,
NULL);
}
}
@@ -1379,10 +1375,9 @@
return SVN_NO_ERROR;
else
return
- svn_error_createf
- (SVN_ERR_WC_SCHEDULE_CONFLICT, NULL,
- "fold_state_changes: '%s' is not a versioned resource",
- name);
+ svn_error_createf (SVN_ERR_WC_SCHEDULE_CONFLICT, NULL,
+ "'%s' is not under version control",
+ name);
}
/* Get the default entry */
@@ -1407,26 +1402,23 @@
{
if (*schedule == svn_wc_schedule_add)
return
- svn_error_createf
- (SVN_ERR_WC_SCHEDULE_CONFLICT, NULL,
- "fold_state_changes: Can't add '%s' to deleted directory"
- "--try undeleting its parent directory first",
- name);
+ svn_error_createf (SVN_ERR_WC_SCHEDULE_CONFLICT, NULL,
+ "Can't add '%s' to deleted directory; "
+ "try undeleting its parent directory first",
+ name);
if (*schedule == svn_wc_schedule_replace)
return
- svn_error_createf
- (SVN_ERR_WC_SCHEDULE_CONFLICT, NULL,
- "fold_state_changes: Can't replace '%s' in deleted directory"
- "--try undeleting its parent directory first",
- name);
+ svn_error_createf (SVN_ERR_WC_SCHEDULE_CONFLICT, NULL,
+ "Can't replace '%s' in deleted directory; "
+ "try undeleting its parent directory first",
+ name);
}
if (entry->absent && (*schedule == svn_wc_schedule_add))
{
return svn_error_createf
(SVN_ERR_WC_SCHEDULE_CONFLICT, NULL,
- "fold_state_changes: '%s' is marked as absent, "
- "so cannot be scheduled for addition",
+ "'%s' is marked as absent, so it cannot be scheduled for
addition",
name);
}
@@ -1455,8 +1447,7 @@
return
svn_error_createf
(SVN_ERR_WC_SCHEDULE_CONFLICT, NULL,
- "fold_state_changes: Entry '%s' already under version
control",
- name);
+ "Entry '%s' is already under version control", name);
}
break;
@@ -1548,8 +1539,7 @@
return
svn_error_createf
(SVN_ERR_WC_SCHEDULE_CONFLICT, NULL,
- "fold_state_changes: Entry '%s' has illegal schedule",
- name);
+ "Entry '%s' has illegal schedule", name);
}
return SVN_NO_ERROR;
}
@@ -1799,7 +1789,7 @@
else
return svn_error_createf (SVN_ERR_NODE_UNKNOWN_KIND, NULL,
- "%s: unrecognized node kind.", path);
+ "'%s' has an unrecognized node kind.", path);
}
@@ -1832,6 +1822,6 @@
}
else
return svn_error_createf (SVN_ERR_WC_PATH_FOUND, NULL,
- "svn_wc_mark_missing_deleted: path '%s' isn't
"
- "missing.", path);
+ "Unexpectedly found '%s': "
+ "path is marked 'missing'", path);
}
Index: subversion/libsvn_wc/copy.c
===================================================================
--- subversion/libsvn_wc/copy.c (revision 7810)
+++ subversion/libsvn_wc/copy.c (working copy)
@@ -142,7 +142,7 @@
SVN_ERR (svn_io_check_path (dst_path, &dst_kind, pool));
if (dst_kind != svn_node_none)
return svn_error_createf (SVN_ERR_ENTRY_EXISTS, NULL,
- "'%s' already exists and is in the way.",
+ "'%s' already exists and is in the way",
dst_path);
/* Even if DST_PATH doesn't exist it may still be a versioned file; it
@@ -170,16 +170,15 @@
if (! src_entry)
return svn_error_createf
(SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "Cannot copy or move '%s' -- it's not under version control",
+ "Cannot copy or move '%s': it's not under version control",
src_path);
if ((src_entry->schedule == svn_wc_schedule_add)
|| (! src_entry->url)
|| (src_entry->copied))
return svn_error_createf
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Cannot copy or move '%s' -- it's not in the repository yet,\n"
- "perhaps because it is a copy or is inside a copied tree.\n"
- "Try committing first.",
+ "Cannot copy or move '%s': it's not in the repository yet; "
+ "try committing first",
src_path);
/* Now, make an actual copy of the working file. */
@@ -293,8 +292,8 @@
|| (src_entry->copied))
return svn_error_createf
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Not allowed to copy or move '%s' -- it's not in the repository
yet.\n"
- "Try committing first.",
+ "Not allowed to copy or move '%s': it is not in the repository yet;
"
+ "try committing first",
src_path);
/* Recursively copy the whole directory over. This gets us all
Index: subversion/libsvn_wc/util.c
===================================================================
--- subversion/libsvn_wc/util.c (revision 7810)
+++ subversion/libsvn_wc/util.c (working copy)
@@ -78,7 +78,7 @@
{
/* A weird and probably rare situation. */
return svn_error_create (0, NULL,
- "unable to make any directories");
+ "Unable to make any directories");
}
else /* We have a valid path, so recursively ensure it. */
{
Index: subversion/libsvn_wc/adm_crawler.c
===================================================================
--- subversion/libsvn_wc/adm_crawler.c (revision 7810)
+++ subversion/libsvn_wc/adm_crawler.c (working copy)
@@ -353,9 +353,8 @@
{
return svn_error_createf
(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "The entry '%s' is no longer a directory,\n"
- "which prevents proper updates.\n"
- "Please remove this entry and try updating again.",
+ "The entry '%s' is no longer a directory; "
+ "remove the entry before updating",
this_path);
}
@@ -573,7 +572,7 @@
svn_error_t *fserr;
if ((fserr = reporter->abort_report (report_baton)))
{
- fserr = svn_error_quick_wrap (fserr, "Error aborting report.");
+ fserr = svn_error_quick_wrap (fserr, "Error aborting report");
svn_error_compose (err, fserr);
}
return err;
@@ -670,12 +669,9 @@
return svn_error_createf
(SVN_ERR_WC_CORRUPT_TEXT_BASE, NULL,
- "svn_wc_transmit_text_deltas: "
- "checksum mismatch for '%s':\n"
- " recorded checksum: %s\n"
- " actual checksum (hex): %s\n"
- " actual checksum (base64): %s\n",
- tb, ent->checksum, base_digest_hex, digest_base64);
+ "Checksum mismatch for '%s': "
+ "expected '%s', actual: '%s'",
+ tb, ent->checksum, base_digest_hex);
}
}
}
Index: subversion/libsvn_wc/log.c
===================================================================
--- subversion/libsvn_wc/log.c (revision 7810)
+++ subversion/libsvn_wc/log.c (working copy)
@@ -168,9 +168,7 @@
if (err)
{
if (! APR_STATUS_IS_ENOENT(err->apr_err))
- return svn_error_quick_wrap (err,
- "file_xfer_under_path: "
- "can't move from to dest");
+ return svn_error_quick_wrap (err, "Can't move source to dest");
svn_error_clear (err);
}
}
@@ -309,7 +307,7 @@
{
svn_xml_signal_bailout
(svn_error_createf (pick_error_code (loggy), err,
- "in directory '%s'",
+ "In directory '%s'",
svn_wc_adm_access_path (loggy->adm_access)),
loggy->parser);
}
@@ -333,12 +331,12 @@
left = svn_xml_get_attr_value (SVN_WC__LOG_ATTR_ARG_1, atts);
if (! left)
return svn_error_createf (pick_error_code (loggy), NULL,
- "missing 'left' attr in '%s'",
+ "Missing 'left' attribute in '%s'",
svn_wc_adm_access_path (loggy->adm_access));
right = svn_xml_get_attr_value (SVN_WC__LOG_ATTR_ARG_2, atts);
if (! right)
return svn_error_createf (pick_error_code (loggy), NULL,
- "missing 'right' attr in '%s'",
+ "Missing 'right' attribute in '%s'",
svn_wc_adm_access_path (loggy->adm_access));
/* Grab all three labels too. If non-existent, we'll end up passing
@@ -379,7 +377,7 @@
dest = svn_xml_get_attr_value (SVN_WC__LOG_ATTR_DEST, atts);
if (! dest)
return svn_error_createf (pick_error_code (loggy), NULL,
- "missing dest attr in '%s'",
+ "Missing 'dest' attribute in '%s'",
svn_wc_adm_access_path (loggy->adm_access));
err = file_xfer_under_path (loggy->adm_access, name, dest, action,
@@ -420,7 +418,7 @@
= svn_xml_get_attr_value (SVN_WC__LOG_ATTR_TIMESTAMP, atts);
if (! timestamp_string)
return svn_error_createf (pick_error_code (loggy), NULL,
- "missing timestamp attribute in '%s'",
+ "Missing 'timestamp' attribute in '%s'",
svn_wc_adm_access_path (loggy->adm_access));
SVN_ERR (svn_time_from_cstring (×tamp, timestamp_string,
loggy->pool));
@@ -485,13 +483,13 @@
if (err)
return svn_error_createf
(pick_error_code (loggy), err,
- "error checking path '%s'", tfile);
+ "Error checking path '%s'", tfile);
err = svn_io_file_affected_time (&text_time, tfile, loggy->pool);
if (err)
return svn_error_createf
(pick_error_code (loggy), err,
- "error getting file affected time on '%s'", tfile);
+ "Error getting 'affected time' on '%s'", tfile);
entry->text_time = text_time;
}
@@ -516,13 +514,13 @@
if (err)
return svn_error_createf
(pick_error_code (loggy), err,
- "error checking path '%s'", pfile);
+ "Error checking path '%s'", pfile);
err = svn_io_file_affected_time (&prop_time, pfile, loggy->pool);
if (err)
return svn_error_createf
(pick_error_code (loggy), NULL,
- "error getting file affected time on '%s'", pfile);
+ "Error getting 'affected time' on '%s'", pfile);
entry->prop_time = prop_time;
}
@@ -532,7 +530,7 @@
entry, modify_flags, FALSE, loggy->pool);
if (err)
return svn_error_createf (pick_error_code (loggy), err,
- "error merge_syncing entry '%s'", name);
+ "Error modifying entry for '%s'", name);
loggy->entries_modified = TRUE;
return SVN_NO_ERROR;
@@ -656,7 +654,7 @@
/* If no new post-commit revision was given us, bail with an error. */
if (! rev)
return svn_error_createf (pick_error_code (loggy), NULL,
- "missing revision attr for '%s'", name);
+ "Missing 'revision' attribute for '%s'",
name);
/* Read the entry for the affected item. If we can't find the
entry, or if the entry states that our item is not either "this
@@ -668,7 +666,8 @@
if ((! orig_entry)
|| ((! is_this_dir) && (orig_entry->kind != svn_node_file)))
return svn_error_createf (pick_error_code (loggy), NULL,
- "log command for dir '%s' is mislocated",
name);
+ "Log command for directory '%s' is
mislocated",
+ name);
entry = svn_wc_entry_dup (orig_entry, pool);
@@ -835,7 +834,7 @@
tmpf = svn_wc__text_base_path (wf, 1, pool);
if ((err = svn_io_check_path (tmpf, &kind, pool)))
return svn_error_createf (pick_error_code (loggy), err,
- "error checking existence: %s", name);
+ "Error checking existence of '%s'",
name);
if (kind == svn_node_file)
{
svn_boolean_t modified;
@@ -846,7 +845,7 @@
loggy->adm_access,
tmpf, pool)))
return svn_error_createf (pick_error_code (loggy), err,
- "error comparing '%s' and '%s'",
+ "Error comparing '%s' and '%s'",
wf, tmpf);
/* If they are the same, use the working file's timestamp,
@@ -856,7 +855,7 @@
/* Get the timestamp from our chosen file. */
if ((err = svn_io_file_affected_time (&text_time, chosen, pool)))
return svn_error_createf (pick_error_code (loggy), err,
- "error getting affected time: %s",
+ "Error getting 'affected time' for
'%s'",
chosen);
}
}
@@ -905,7 +904,7 @@
loggy->adm_access, TRUE, pool));
if ((err = svn_io_check_path (tmpf, &kind, pool)))
return svn_error_createf (pick_error_code (loggy), err,
- "error checking existence: %s", name);
+ "Error checking existence of '%s'", name);
if (kind == svn_node_file)
{
svn_boolean_t same;
@@ -915,7 +914,7 @@
did with text-time above. */
if ((err = svn_io_files_contents_same_p (&same, wf, tmpf, pool)))
return svn_error_createf (pick_error_code (loggy), err,
- "error comparing '%s' and '%s'",
+ "Error comparing '%s' and '%s'",
wf, tmpf);
/* If they are the same, use the working file's timestamp,
@@ -925,7 +924,7 @@
/* Get the timestamp of our chosen file. */
if ((err = svn_io_file_affected_time (&prop_time, chosen, pool)))
return svn_error_createf (pick_error_code (loggy), err,
- "error getting affected time: %s",
+ "Error getting 'affected time' of
'%s'",
chosen);
/* Examine propchanges here before installing the new
@@ -970,7 +969,7 @@
if ((err = install_committed_file
(&overwrote_working, loggy->adm_access, name, pool)))
return svn_error_createf (pick_error_code (loggy), err,
- "error replacing text-base: %s", name);
+ "Error replacing text-base of '%s'",
name);
/* The previous call will have run +x if the executable property
was added or already present. But if this property was
@@ -990,7 +989,7 @@
if (overwrote_working)
if ((err = svn_io_file_affected_time (&text_time, full_path,
pool)))
return svn_error_createf (pick_error_code (loggy), err,
- "error getting affected time: %s",
+ "Error getting 'affected time' of
'%s'",
full_path);
}
@@ -1030,7 +1029,7 @@
FALSE, pool)))
return svn_error_createf
(pick_error_code (loggy), err,
- "error modifying entry: %s", name);
+ "Error modifying entry of '%s'", name);
loggy->entries_modified = TRUE;
/* If we aren't looking at "this dir" (meaning we are looking at a
@@ -1078,7 +1077,7 @@
| SVN_WC__ENTRY_MODIFY_FORCE),
TRUE, pool)))
return svn_error_createf (pick_error_code (loggy), err,
- "error merge_syncing '%s'", name);
+ "Error modifying entry of '%s'", name);
}
if (unassociated)
@@ -1137,7 +1136,7 @@
signal_error
(loggy, svn_error_createf
(pick_error_code (loggy), NULL,
- "log entry missing name attribute (entry '%s' for dir '%s')",
+ "Log entry missing 'name' attribute (entry '%s' for directory
'%s')",
eltname, svn_wc_adm_access_path (loggy->adm_access)));
return;
}
@@ -1190,9 +1189,9 @@
signal_error
(loggy, svn_error_createf (pick_error_code (loggy),
NULL,
- "unrecognized logfile element in '%s':
'%s'",
- svn_wc_adm_access_path
(loggy->adm_access),
- eltname));
+ "Unrecognized logfile element '%s' in
'%s'",
+ eltname,
+ svn_wc_adm_access_path (loggy->adm_access)));
return;
}
@@ -1200,7 +1199,7 @@
signal_error
(loggy, svn_error_createf
(pick_error_code (loggy), err,
- "start_handler: error processing command '%s' in '%s'",
+ "Error processing command '%s' in '%s'",
eltname, svn_wc_adm_access_path (loggy->adm_access)));
return;
@@ -1245,7 +1244,7 @@
err = svn_wc__open_adm_file (&f, svn_wc_adm_access_path (adm_access),
SVN_WC__ADM_LOG, APR_READ, pool);
if (err)
- return svn_error_quick_wrap (err, "svn_wc__run_log: couldn't open
log.");
+ return svn_error_quick_wrap (err, "Couldn't open log");
do {
buf_len = sizeof (buf);
@@ -1254,9 +1253,10 @@
if (apr_err && !APR_STATUS_IS_EOF(apr_err))
{
apr_file_close (f);
- return svn_error_createf (apr_err, NULL,
- "error reading adm log file in '%s'",
- svn_wc_adm_access_path (adm_access));
+ return
+ svn_error_createf (apr_err, NULL,
+ "Error reading administrative log file in
'%s'",
+ svn_wc_adm_access_path (adm_access));
}
err = svn_xml_parse (parser, buf, buf_len, 0);
@@ -1372,7 +1372,7 @@
if (wc_format_version == 0)
return svn_error_createf
(SVN_ERR_WC_NOT_DIRECTORY, NULL,
- "svn_wc_cleanup: '%s' is not a working copy directory", path);
+ "'%s' is not a working copy directory", path);
/* Lock this working copy directory, or steal an existing lock */
SVN_ERR (svn_wc__adm_steal_write_lock (&adm_access, optional_adm_access,
@@ -1419,7 +1419,7 @@
{
return svn_error_createf
(SVN_ERR_WC_BAD_ADM_LOG, NULL,
- "svn_wc_cleanup: '%s' should be a file, but is not",
log_path);
+ "'%s' should be a file, but is not", log_path);
}
}
Index: subversion/libsvn_wc/adm_ops.c
===================================================================
--- subversion/libsvn_wc/adm_ops.c (revision 7810)
+++ subversion/libsvn_wc/adm_ops.c (working copy)
@@ -218,7 +218,7 @@
else
return svn_error_createf (SVN_ERR_NODE_UNKNOWN_KIND, NULL,
- "Unrecognized node kind: '%s'\n", path);
+ "Unrecognized node kind: '%s'", path);
return SVN_NO_ERROR;
}
@@ -387,8 +387,7 @@
{
apr_file_close (log_fp);
return svn_error_createf (apr_err, NULL,
- "process_committed: "
- "error writing log file for '%s'",
+ "Error writing log file for '%s'",
path);
}
@@ -940,8 +939,8 @@
error so that clients can detect it. */
return svn_error_createf
(SVN_ERR_WC_NODE_KIND_CHANGE, NULL,
- "Could not replace '%s' with a node of a differing type"
- " -- commit the deletion, update the parent, and then add
'%s'",
+ "Can't replace '%s' with a node of a differing type; "
+ "commit the deletion, update the parent, and then add '%s'",
path, path);
}
if (orig_entry->schedule == svn_wc_schedule_delete)
@@ -955,12 +954,12 @@
if (! parent_entry)
return svn_error_createf
(SVN_ERR_ENTRY_NOT_FOUND, NULL,
- "Could not find parent directory's entry while trying to add '%s'",
+ "Can't not find parent directory's entry while trying to add '%s'",
path);
if (parent_entry->schedule == svn_wc_schedule_delete)
return svn_error_createf
(SVN_ERR_WC_SCHEDULE_CONFLICT, NULL,
- "Can not add '%s' to a parent directory scheduled for deletion",
+ "Can't add '%s' to a parent directory scheduled for deletion",
path);
/* Init the modify flags. */
@@ -1152,7 +1151,7 @@
apr_pool_t *pool)
{
return svn_error_quick_wrap
- (err, apr_psprintf (pool, "revert: error %s for '%s'", verb, path));
+ (err, apr_psprintf (pool, "Error '%s' for '%s'", verb, path));
}
@@ -1378,8 +1377,8 @@
SVN_ERR (svn_wc_entry (&entry, path, dir_access, FALSE, pool));
if (! entry)
return svn_error_createf
- (SVN_ERR_ENTRY_NOT_FOUND, NULL,
- "Cannot revert '%s' -- not a versioned resource", path);
+ (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
+ "Cannot revert '%s': not a versioned resource", path);
/* Safeguard 1.5: is this a missing versioned directory? */
if (entry->kind == svn_node_dir)
@@ -1410,7 +1409,7 @@
if ((entry->kind != svn_node_file) && (entry->kind != svn_node_dir))
return svn_error_createf
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Cannot revert '%s' -- unsupported entry node kind", path);
+ "Cannot revert '%s': unsupported entry node kind", path);
/* Safeguard 3: can we deal with the node kind of PATH current in
the working copy? */
@@ -1420,7 +1419,7 @@
&& (kind != svn_node_dir))
return svn_error_createf
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Cannot revert '%s' -- unsupported node kind in working copy",
path);
+ "Cannot revert '%s': unsupported node kind in working copy", path);
/* For directories, determine if PATH is a WC root so that we can
tell if it is safe to split PATH into a parent directory and
@@ -1467,9 +1466,8 @@
if (path[0] == '\0')
{
return svn_error_createf (SVN_ERR_WC_INVALID_OP_ON_CWD, NULL,
- "%s", "Cannot revert addition of current directory, "
- "please try this operation again from the parent "
- "directory.");
+ "%s", "Cannot revert addition of current directory; "
+ "please try again from the parent directory");
}
SVN_ERR (svn_wc_entries_read (&entries, parent_access, TRUE,
pool));
@@ -1675,7 +1673,7 @@
FALSE, adm_access, pool));
if (text_modified_p && instant_error)
return svn_error_createf (SVN_ERR_WC_LEFT_LOCAL_MOD, NULL,
- "file '%s' has local modifications.",
+ "File '%s' has local modifications.",
name);
/* Remove NAME from PATH's entries file: */
@@ -1717,7 +1715,7 @@
if (destroy_wf)
{
if (text_modified_p) /* Don't kill local mods. */
- return svn_error_create (SVN_ERR_WC_LEFT_LOCAL_MOD, NULL, "");
+ return svn_error_create (SVN_ERR_WC_LEFT_LOCAL_MOD, NULL,
NULL);
else /* The working file is still present; remove it. */
SVN_ERR (remove_file_if_present (full_path, pool));
}
@@ -1883,7 +1881,7 @@
} /* end of directory case */
if (left_something)
- return svn_error_create (SVN_ERR_WC_LEFT_LOCAL_MOD, NULL, "");
+ return svn_error_create (SVN_ERR_WC_LEFT_LOCAL_MOD, NULL, NULL);
else
return SVN_NO_ERROR;
}
@@ -2084,7 +2082,7 @@
SVN_ERR (svn_wc_entry (&entry, path, adm_access, FALSE, pool));
if (! entry)
return svn_error_createf (SVN_ERR_ENTRY_NOT_FOUND, NULL,
- "Not under version control: '%s'", path);
+ "'%s' is not under version control",
path);
SVN_ERR (resolve_found_entry_callback (path, entry, baton, pool));
}
Index: subversion/libsvn_wc/adm_files.c
===================================================================
--- subversion/libsvn_wc/adm_files.c (revision 7810)
+++ subversion/libsvn_wc/adm_files.c (working copy)
@@ -195,7 +195,7 @@
segfault or other obvious indicator that something went
wrong. Even so, not sure if it's appropriate. Thoughts? */
err = svn_error_create
- (0, NULL, "svn_wc__make_admin_thing: bad type indicator");
+ (0, NULL, "Bad type indicator");
}
return err;
@@ -474,9 +474,7 @@
{
err = svn_error_quick_wrap(err,
"Your .svn/tmp directory may be missing or "
- "corrupt. "
- "Please run 'svn cleanup' and try your "
- "operation again.");
+ "corrupt; run 'svn cleanup' and try again");
}
}
@@ -654,13 +652,14 @@
if (wc_format_version == 0)
return svn_error_createf
(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "svn_wc__open_props: '%s' is not a working copy directory",
parent_dir);
+ "'%s' is not a working copy", parent_dir);
/* Then examine the flags to know -which- kind of prop file to get. */
if (base && wcprops)
return svn_error_create (SVN_ERR_WC_PATH_NOT_FOUND, NULL,
- "open_props: no such thing as 'base'
wcprops!");
+ "No such thing as 'base' "
+ "working copy properties!");
else if (base)
{
@@ -728,13 +727,14 @@
if (wc_format_version == 0)
return svn_error_createf
(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "svn_wc__close_props: '%s' is not a working copy directory",
parent_dir);
+ "'%s' is not a working copy", parent_dir);
/* Then examine the flags to know -which- kind of prop file to get. */
if (base && wcprops)
return svn_error_create (SVN_ERR_WC_PATH_NOT_FOUND, NULL,
- "close_props: no such thing as 'base'
wcprops!");
+ "No such thing as 'base' "
+ "working copy properties!");
else if (base)
{
@@ -797,7 +797,8 @@
if (base && wcprops)
return svn_error_create (SVN_ERR_WC_PATH_NOT_FOUND, NULL,
- "close_props: no such thing as 'base'
wcprops!");
+ "No such thing as 'base' "
+ "working copy properties!");
else if (base)
{
@@ -916,7 +917,7 @@
SVN_ERR (svn_wc_adm_close (adm_access));
if (!entry)
return svn_error_createf (SVN_ERR_ENTRY_NOT_FOUND, NULL,
- "no entry for '%s'", path);
+ "No entry for '%s'", path);
/* The revisions must match except when adding a directory with a
name that matches a directory scheduled for deletion. That's
@@ -926,7 +927,7 @@
&& !(entry->schedule == svn_wc_schedule_delete && revision == 0))
return
svn_error_createf (SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "revision %" SVN_REVNUM_T_FMT
+ "Revision %" SVN_REVNUM_T_FMT
" doesn't match existing revision %"
SVN_REVNUM_T_FMT " in '%s'",
revision, entry->revision, path);
Index: subversion/libsvn_wc/lock.c
===================================================================
--- subversion/libsvn_wc/lock.c (revision 7810)
+++ subversion/libsvn_wc/lock.c (working copy)
@@ -153,7 +153,7 @@
}
return svn_error_createf (SVN_ERR_WC_LOCKED, NULL,
- "working copy locked: %s",
+ "Working copy '%s' locked",
svn_path_local_style (adm_access->path, pool));
}
@@ -332,7 +332,7 @@
locked: if it's not locked call svn_wc_adm_open, if it is locked
call svn_wc_adm_retrieve. */
return svn_error_createf (SVN_ERR_WC_LOCKED, NULL,
- "directory already locked (%s)",
+ "Working copy '%s' locked",
path);
}
@@ -590,7 +590,7 @@
for NULL batons. */
if (! *adm_access)
return svn_error_createf (SVN_ERR_WC_NOT_LOCKED, NULL,
- "directory '%s' not locked",
+ "Working copy '%s' not locked",
path);
return SVN_NO_ERROR;
@@ -771,14 +771,14 @@
SVN_ERR (svn_wc_locked (&locked, adm_access->path,
adm_access->pool));
if (! locked)
return svn_error_createf (SVN_ERR_WC_NOT_LOCKED, NULL,
- "write-lock stolen in: %s",
+ "Write-lock stolen in '%s'",
adm_access->path);
}
}
else
{
return svn_error_createf (SVN_ERR_WC_NOT_LOCKED, NULL,
- "no write-lock in: %s", adm_access->path);
+ "No write-lock in '%s'", adm_access->path);
}
return SVN_NO_ERROR;
@@ -798,8 +798,7 @@
*locked = FALSE;
else
return svn_error_createf (SVN_ERR_WC_LOCKED, NULL,
- "svn_wc_locked: "
- "lock file is not a regular file (%s)",
+ "Lock file '%s' is not a regular file",
lockfile);
return SVN_NO_ERROR;
Index: subversion/libsvn_wc/update_editor.c
===================================================================
--- subversion/libsvn_wc/update_editor.c (revision 7810)
+++ subversion/libsvn_wc/update_editor.c (working copy)
@@ -804,7 +804,7 @@
return svn_error_createf
(SVN_ERR_WC_OBSTRUCTED_UPDATE, tmp_err,
- "failed to delete dir '%s': local mods found within.", path);
+ "Won't delete locally modified directory '%s'", path);
}
return err;
@@ -848,7 +848,7 @@
if (tmodified_p || pmodified_p)
return svn_error_createf
(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "failed to delete file '%s': file has local modifications.",
+ "Won't delete locally modified file '%s'",
base_name);
}
@@ -903,7 +903,7 @@
{
apr_file_close (log_fp);
return svn_error_createf (apr_err, NULL,
- "delete error writing log file for '%s'.",
+ "Error writing log file for '%s'",
parent_path);
}
@@ -1009,14 +1009,14 @@
if (kind != svn_node_none)
return svn_error_createf
(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "failed to add directory '%s': object of the same name already
exists",
+ "Failed to add directory '%s': object of the same name already
exists",
db->path);
/* It may not be named the same as the administrative directory. */
if (strcmp (svn_path_basename (path, pool), SVN_WC_ADM_DIR_NAME) == 0)
return svn_error_createf
(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "failed to add directory '%s': \nobject of the same name as the "
+ "Failed to add directory '%s': object of the same name as the "
"administrative directory", db->path);
/* Either we got real copyfrom args... */
@@ -1029,7 +1029,7 @@
copied tree. Someday! */
return svn_error_createf
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "failed to add directory '%s': copyfrom args not yet supported",
+ "Failed to add directory '%s': copyfrom arguments not yet
supported",
db->path);
}
else /* ...or we got invalid copyfrom args. */
@@ -1049,7 +1049,7 @@
if (dir_entry && dir_entry->schedule == svn_wc_schedule_add)
return svn_error_createf
(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "failed to add dir '%s': \nobject of the same name is already "
+ "Failed to add dir '%s': object of the same name is already "
"scheduled for addition", path);
/* Immediately create an entry for the new directory in the parent.
@@ -1289,7 +1289,7 @@
{
apr_file_close (log_fp);
return svn_error_createf (apr_err, NULL,
- "error writing log file for '%s'",
+ "Error writing log file for '%s'",
db->path);
}
@@ -1350,7 +1350,7 @@
if (ent && (ent->schedule == svn_wc_schedule_add))
return svn_error_createf
(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "failed to mark '%s' absent:\nitem of the same name is already "
+ "Failed to mark '%s' absent: item of the same name is already "
"scheduled for addition", path);
/* Immediately create an entry for the new item in the parent. Note
@@ -1441,7 +1441,7 @@
if (adding && (kind != svn_node_none))
return svn_error_createf
(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "failed to add file '%s': object of the same name already exists",
+ "Failed to add file '%s': object of the same name already exists",
fb->path);
/* sussman sez: If we're trying to add a file that's already in
@@ -1462,15 +1462,15 @@
if (adding && entry && entry->schedule == svn_wc_schedule_add)
return svn_error_createf
(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "failed to add file '%s': \nobject of the same name is already "
+ "Failed to add file '%s': object of the same name is already "
"scheduled for addition", fb->path);
/* If replacing, make sure the .svn entry already exists. */
if ((! adding) && (! entry))
- return svn_error_createf (SVN_ERR_ENTRY_NOT_FOUND, NULL,
- "trying to open non-versioned file "
- "'%s' in directory '%s'",
+ return svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
+ "File '%s' in directory '%s' "
+ "is not a versioned resource",
fb->name, pb->path);
/* ### todo: right now the incoming copyfrom* args are being
@@ -1572,9 +1572,7 @@
if (strcmp (hex_digest, base_checksum) != 0)
return svn_error_createf
(SVN_ERR_WC_CORRUPT_TEXT_BASE, NULL,
- "apply_textdelta: checksum mismatch for '%s':\n"
- " expected checksum: %s\n"
- " actual checksum: %s\n",
+ "Checksum mismatch for '%s'; expected: '%s', actual: '%s'",
tb, base_checksum, hex_digest);
}
@@ -1591,11 +1589,8 @@
{
return svn_error_createf
(SVN_ERR_WC_CORRUPT_TEXT_BASE, NULL,
- "apply_textdelta: checksum mismatch for '%s':\n"
- " recorded checksum: %s\n"
- " actual checksum (hex): %s\n"
- " actual checksum (base64): %s\n",
- tb, ent->checksum, hex_digest, base64_digest);
+ "Checksum mismatch for '%s'; recorded: '%s', actual:
'%s'",
+ tb, ent->checksum, hex_digest);
}
}
}
@@ -2249,7 +2244,7 @@
{
apr_file_close (log_fp);
return svn_error_createf (apr_err, NULL,
- "error writing log for '%s'.",
+ "Error writing log for '%s'.",
file_path);
}
@@ -2324,10 +2319,7 @@
if (real_sum && (strcmp (text_checksum, real_sum) != 0))
return svn_error_createf
(SVN_ERR_CHECKSUM_MISMATCH, NULL,
- "close_file: expected and actual checksums do not match:\n"
- "(%s):\n"
- " expected checksum: %s\n"
- " actual checksum: %s\n",
+ "Checksum mismatch for '%s'; expected: '%s', actual: '%s'",
fb->path, text_checksum, real_sum);
}
}
@@ -2706,8 +2698,8 @@
SVN_ERR (svn_wc_entry (&entry, path, adm_access, FALSE, pool));
if (! entry)
return svn_error_createf
- (SVN_ERR_ENTRY_NOT_FOUND, NULL,
- "svn_wc_is_wc_root: '%s' is not a versioned resource", path);
+ (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
+ "'%s' is not under version control", path);
if (kind)
*kind = entry->kind;
@@ -2734,7 +2726,7 @@
if (! p_entry->url)
return svn_error_createf
(SVN_ERR_ENTRY_MISSING_URL, NULL,
- "svn_wc_is_wc_root: '%s' has no ancestry information.",
+ "'%s' has no ancestry information.",
parent);
/* If PATH's parent in the WC is not its parent in the repository,
Index: subversion/libsvn_wc/questions.c
===================================================================
--- subversion/libsvn_wc/questions.c (revision 7810)
+++ subversion/libsvn_wc/questions.c (working copy)
@@ -56,8 +56,7 @@
if (kind == svn_node_none)
{
return svn_error_createf
- (APR_ENOENT, NULL,
- "svn_wc_check_wc: '%s' does not exist", path);
+ (APR_ENOENT, NULL, "'%s' does not exist", path);
}
else if (kind != svn_node_dir)
*wc_format = 0;
@@ -96,7 +95,7 @@
{
return svn_error_createf
(SVN_ERR_WC_UNSUPPORTED_FORMAT, NULL,
- "working copy format of '%s' is too old (%d);\n"
+ "Working copy format of '%s' is too old (%d); "
"please check out your working copy again",
path, wc_format);
}
@@ -104,7 +103,7 @@
{
return svn_error_createf
(SVN_ERR_WC_UNSUPPORTED_FORMAT, NULL,
- "this client is too old to work with working copy '%s';\n"
+ "This client is too old to work with working copy '%s'; "
"please get a newer Subversion client",
path);
}
@@ -173,7 +172,7 @@
if (entry == NULL)
return svn_error_createf
(SVN_ERR_ENTRY_NOT_FOUND, NULL,
- "timestamps_equal_p: '%s' not under version control", entryname);
+ "'%s' is not under version control", entryname);
/* Get the timestamp from the working file and the entry */
if (timestamp_kind == svn_wc__text_time)
Index: subversion/libsvn_wc/translate.c
===================================================================
--- subversion/libsvn_wc/translate.c (revision 7810)
+++ subversion/libsvn_wc/translate.c (working copy)
@@ -122,7 +122,7 @@
{
return svn_error_createf
(SVN_ERR_IO_INCONSISTENT_EOL, NULL,
- "svn_wc_translated_file: '%s' has unknown eol style property",
+ "'%s' has unknown value for svn:eol-style property",
vfile);
}
Index: subversion/tests/clients/cmdline/basic_tests.py
===================================================================
--- subversion/tests/clients/cmdline/basic_tests.py (revision 7810)
+++ subversion/tests/clients/cmdline/basic_tests.py (working copy)
@@ -304,7 +304,7 @@
# This commit should fail due to text base corruption.
svntest.actions.run_and_verify_commit (wc_dir, expected_output,
- expected_status, "checksum",
+ expected_status, "svn:
Checksum",
None, None, None, None, wc_dir)
# Restore the uncorrupted text base.
@@ -353,7 +353,7 @@
expected_output,
expected_disk,
expected_status,
- "checksum", other_wc)
+ "svn: Checksum", other_wc)
# Restore the uncorrupted text base.
os.chmod (tb_dir_path, 0777)
Index: subversion/tests/clients/cmdline/commit_tests.py
===================================================================
--- subversion/tests/clients/cmdline/commit_tests.py (revision 7810)
+++ subversion/tests/clients/cmdline/commit_tests.py (working copy)
@@ -484,7 +484,7 @@
svntest.actions.run_and_verify_commit (wc_dir,
None,
None,
- "Can't find an entry",
+ "svn: Tried a versioning
operation",
None, None,
None, None,
os.path.join(wc_dir,'blorg'))
Index: subversion/tests/clients/cmdline/merge_tests.py
===================================================================
--- subversion/tests/clients/cmdline/merge_tests.py (revision 7810)
+++ subversion/tests/clients/cmdline/merge_tests.py (working copy)
@@ -722,9 +722,9 @@
# Merge B 3:4 into B2 now causes a conflict
expected_disk.add({
'E/dir_conflicts.prej'
- : Item("prop 'foo': user deleted, but update sets it to 'mod_foo'.\n"),
+ : Item("Property 'foo' locally deleted, but update sets it to
'mod_foo'"),
'E/alpha.prej'
- : Item("prop 'foo': user deleted, but update sets it to 'mod_foo'.\n"),
+ : Item("Property 'foo' locally deleted, but update sets it to
'mod_foo'"),
})
expected_disk.tweak('E', 'E/alpha', props={'bar' : 'bar_val'})
expected_status.tweak('E', 'E/alpha', status=' C')
--
GMX Weihnachts-Special: Seychellen-Traumreise zu gewinnen!
Rentier entlaufen. Finden Sie Rudolph! Als Belohnung winken
tolle Preise. http://www.gmx.net/de/cgi/specialmail/
+++ GMX - die erste Adresse für Mail, Message, More! +++
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Nov 19 20:56:14 2003