Philip, I wanted to amend this log message by adding
"See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=231364 and
http://subversion.tigris.org/servlets/BrowseList?list=dev&by=thread&from=155350
for details."
...but as the original bug report says it's a problem even when the
backup dir isn't ".", I began to wonder if this commit was made after
all the correspondence in the bug, or if there's more planned, or... ?
+1 on the commit, of course. I'm just not sure how much extra context
to give it.
-Karl
philip@tigris.org writes:
> Author: philip
> Date: Mon Feb 16 12:33:45 2004
> New Revision: 8659
>
> Modified:
> trunk/subversion/libsvn_subr/io.c
> trunk/subversion/tests/clients/cmdline/svnadmin_tests.py
> Log:
> Make 'svnadmin hotcopy PATH .' work, previously it failed with a
> confusing error about the current directory not existing.
>
> * subversion/libsvn_subr/io.c (dir_make): Catch "" path.
>
> * subversion/tests/clients/cmdline/svnadmin_tests.py: (hotcopy_dot): New
> test.
>
>
> Modified: trunk/subversion/libsvn_subr/io.c
> ==============================================================================
> --- trunk/subversion/libsvn_subr/io.c (original)
> +++ trunk/subversion/libsvn_subr/io.c Mon Feb 16 12:33:45 2004
> @@ -1774,6 +1774,10 @@
>
> SVN_ERR (svn_path_cstring_from_utf8 (&path_apr, path, pool));
>
> + /* APR doesn't like "" directories */
> + if (path_apr[0] == '\0')
> + path_apr = ".";
> +
> status = apr_dir_make (path_apr, perm, pool);
>
> if (status)
>
> Modified: trunk/subversion/tests/clients/cmdline/svnadmin_tests.py
> ==============================================================================
> --- trunk/subversion/tests/clients/cmdline/svnadmin_tests.py (original)
> +++ trunk/subversion/tests/clients/cmdline/svnadmin_tests.py Mon Feb 16 12:33:45 2004
> @@ -159,6 +159,30 @@
> "Output of 'svnadmin dump --quiet' is unexpected.",
> 'STDERR', [], errput)
>
> +#----------------------------------------------------------------------
> +
> +def hotcopy_dot(sbox):
> + "'svnadmin hotcopy PATH .'"
> + sbox.build()
> +
> + backup_dir, backup_url = sbox.add_repo_path('backup')
> + os.mkdir(backup_dir)
> + cwd = os.getcwd()
> + try:
> + os.chdir(backup_dir)
> + output, errput = svntest.main.run_svnadmin("hotcopy",
> + os.path.join(cwd, sbox.repo_dir),
> + '.')
> + if errput:
> + raise svntest.Failure
> + finally:
> + os.chdir(cwd)
> +
> + origout, origerr = svntest.main.run_svnadmin("dump", sbox.repo_dir, '--quiet')
> + backout, backerr = svntest.main.run_svnadmin("dump", backup_dir, '--quiet')
> + if origerr or backerr or origout != backout:
> + raise svntest.Failure
> +
>
> ########################################################################
> # Run the tests
> @@ -169,6 +193,7 @@
> dump_copied_dir,
> dump_move_dir_modify_child,
> dump_quiet,
> + hotcopy_dot,
> ]
>
> if __name__ == '__main__':
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Feb 17 18:35:18 2004