Re: [PATCH] fix for issue 554

On Sun, Jan 13, 2002 at 08:34:28PM -0500, Garrett Rooney wrote:
>...
> +++ ./subversion/libsvn_client/commit.c Sun Jan 13 19:37:15 2002
> @@ -517,6 +517,10 @@
> /* Construct full URL from PATH. */
> SVN_ERR (svn_wc_entry (&entry, base_dir, pool));
> url = entry->url;
> +
> + if (entry->copied)
> + return svn_error_create(SVN_ERR_CL_COMMIT_IN_ADDED_DIR, 0, NULL,
> + pool, "");

There should be a message in there.

>...
> +++ ./subversion/tests/clients/cmdline/commit_tests.py Sun Jan 13 20:24:33 2002
> @@ -1211,6 +1211,29 @@
> return 1
> return 0
>
> +def commit_in_dir_scheduled_for_addition():
> + "commit a file inside a directory that's already scheduled to be added"
> +
> + # Bootstrap: make independent repo and working copy.
> + sbox = sandbox(commit_deleted_edited)
> + wc_dir = os.path.join(svntest.main.general_wc_dir, sbox)
> +
> + if svntest.actions.make_repo_and_wc(sbox): return 1
> +
> + A_path = os.path.join(wc_dir, 'A')
> + Z_path = os.path.join(wc_dir, 'Z')
> + mu_path = os.path.join(wc_dir, 'Z', 'mu')
> +
> + svntest.main.run_svn(None, 'move', A_path, Z_path)
> +
> + was_cwd = os.getcwd()

was_cwd is unused.

Fix those (and the log message you noted), and +1

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org