> -----Original Message-----
> From: Stephen Butler [mailto:sbutler_at_elego.de]
> Sent: vrijdag 13 februari 2009 14:34
> To: svn_at_subversion.tigris.org
> Subject: svn commit: r35842 - in trunk/subversion: libsvn_wc
> tests/cmdline
>
> Author: sbutler
> Date: Fri Feb 13 05:33:51 2009
> New Revision: 35842
>
> Log:
> For issue 3209, change an error message back to what it was in 1.5 and
> print error-message paths in local style. (Corrections for r35840.)
>
> * subversion/libsvn_wc/update_editor.c
> (add_directory): Replace the "independent working copy" error
> message, which is a bit vague, with the old "already exists"
> message. Print local-style paths.
> (add_file): Print local-style paths.
Hi,
I actually think the independent working copy messages are much clearer than
the 'a versioned directory of the same name already exists' message.
My GUI users don't think of a normal copied directory (no svn cp) that just
shows the TortoiseSVN glyphs as a separate working copy.
So in most cases they just send us an e-mail: Something is wrong.
The 'independent working copy' term will say more to them than 'versioned
directory that already exists' (Which doesn't say anything about one working
copy below another one)
Bert
>
> * subversion/tests/cmdline/switch_tests.py
> (forced_switch_failures): Tweak an error expectation.
>
> * subversion/tests/cmdline/update_tests.py
> (forced_update_failures): Tweak an error expectation.
>
> * subversion/tests/cmdline/checkout_tests.py
> (forced_checkout_with_versioned_obstruction): Tweak error
> expectations.
>
> Modified:
> trunk/subversion/libsvn_wc/update_editor.c
> trunk/subversion/tests/cmdline/checkout_tests.py
> trunk/subversion/tests/cmdline/switch_tests.py
> trunk/subversion/tests/cmdline/update_tests.py
>
> Modified: trunk/subversion/libsvn_wc/update_editor.c
> URL:
> http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/update_edit
> or.c?pathrev=35842&r1=35841&r2=35842
> =======================================================================
> =======
> --- trunk/subversion/libsvn_wc/update_editor.c Fri Feb 13 04:27:21
2009
> (r35841)
> +++ trunk/subversion/libsvn_wc/update_editor.c Fri Feb 13 05:33:51
2009
> (r35842)
> @@ -2316,22 +2316,25 @@ add_directory(const char *path,
> if (strcmp(entry->uuid, parent_entry->uuid) != 0)
> return svn_error_createf
> (SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
> - _("UUID mismatch: existing dir '%s' was checked out "
> - "from a different repository"), db->path);
> + _("UUID mismatch: existing directory '%s' was checked
> out "
> + "from a different repository"),
> + svn_path_local_style(db->path, pool));
>
> if (!eb->switch_url
> && strcmp(db->new_URL, entry->url) != 0)
> return svn_error_createf
> (SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
> - _("URL '%s' of existing dir '%s' does not match "
> + _("URL '%s' of existing directory '%s' does not match "
> "expected URL '%s'"),
> - entry->url, db->path, db->new_URL);
> + entry->url, svn_path_local_style(db->path, pool),
> + db->new_URL);
>
> if (! entry_in_parent)
> - return svn_error_createf
> - (SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
> - _("Existing dir at '%s' is an independent working
> copy."),
> - db->path);
> + return svn_error_createf
> + (SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
> + _("Failed to add directory '%s': a versioned "
> + "directory of the same name already exists"),
> + svn_path_local_style(db->path, pool));
>
> if ((entry->schedule == svn_wc_schedule_add
> || entry->schedule == svn_wc_schedule_replace)
> @@ -3476,7 +3479,8 @@ add_file(const char *path,
> return svn_error_createf
> (SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
> _("UUID mismatch: existing file '%s' was checked out "
> - "from a different repository"), full_path);
> + "from a different repository"),
> + svn_path_local_style(full_path, pool));
>
> if (!eb->switch_url
> && strcmp(fb->new_URL, entry->url) != 0)
> @@ -3484,7 +3488,8 @@ add_file(const char *path,
> (SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
> _("URL '%s' of existing file '%s' does not match "
> "expected URL '%s'"),
> - entry->url, full_path, fb->new_URL);
> + entry->url, svn_path_local_style(full_path, pool),
> + fb->new_URL);
> }
>
> if (entry && kind == svn_node_file)
>
> Modified: trunk/subversion/tests/cmdline/checkout_tests.py
> URL:
> http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/checkou
> t_tests.py?pathrev=35842&r1=35841&r2=35842
> =======================================================================
> =======
> --- trunk/subversion/tests/cmdline/checkout_tests.py Fri Feb 13
> 04:27:21 2009 (r35841)
> +++ trunk/subversion/tests/cmdline/checkout_tests.py Fri Feb 13
> 05:33:51 2009 (r35842)
> @@ -296,7 +296,7 @@ def forced_checkout_with_versioned_obstr
> "Expected error during co", None, svntest.verify.AnyOutput,
> "co", "--force", repo_url, fresh_wc_dir)
>
> - test_stderr("'.*A' is an independent working copy", serr)
> + test_stderr("Failed to add directory '.*A'.*already exists", serr)
>
> # Checkout the entire first repos into the other dir. This should
> # fail because it's a different repository.
> @@ -304,7 +304,7 @@ def forced_checkout_with_versioned_obstr
> "Expected error during co", None, svntest.verify.AnyOutput,
> "co", "--force", repo_url, other_wc_dir)
>
> - test_stderr("svn: UUID mismatch: existing dir '.*A'", serr)
> + test_stderr("UUID mismatch: existing directory '.*A'", serr)
>
> #ensure that other_wc_dir_A is not affected by this forced checkout.
> svntest.actions.run_and_verify_svn("empty status output", None,
>
> Modified: trunk/subversion/tests/cmdline/switch_tests.py
> URL:
> http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/switch_
> tests.py?pathrev=35842&r1=35841&r2=35842
> =======================================================================
> =======
> --- trunk/subversion/tests/cmdline/switch_tests.py Fri Feb 13
> 04:27:21 2009 (r35841)
> +++ trunk/subversion/tests/cmdline/switch_tests.py Fri Feb 13
> 05:33:51 2009 (r35842)
> @@ -1301,7 +1301,7 @@ def forced_switch_failures(sbox):
> G_path,
> sbox.repo_url + "/A/D/H",
> None, None, None,
> - "independent working copy",
> + "Failed to add directory '.*I'.*already
> exists",
> None, None, None, None, False,
> '--force')
>
>
> Modified: trunk/subversion/tests/cmdline/update_tests.py
> URL:
> http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/update_
> tests.py?pathrev=35842&r1=35841&r2=35842
> =======================================================================
> =======
> --- trunk/subversion/tests/cmdline/update_tests.py Fri Feb 13
> 04:27:21 2009 (r35841)
> +++ trunk/subversion/tests/cmdline/update_tests.py Fri Feb 13
> 05:33:51 2009 (r35842)
> @@ -2090,7 +2090,7 @@ def forced_update_failures(sbox):
> ['Checked out revision 2.\n'], [],
> "co", I_url, I_path)
> svntest.actions.run_and_verify_update(C_Path, None, None, None,
> - "independent working copy",
> + "Failed to add directory '.*I'.*already
> exists",
> None, None, None, None, 0,
> C_Path,
> '--force')
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageI
> d=1150823
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1151156
Received on 2009-02-13 15:50:43 CET