[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Fix a bug in ra_serf (was: Fix a regression from 1.4 in trunk and branch)

From: Augie Fackler <durin42_at_gmail.com>
Date: Fri, 1 Feb 2008 14:12:42 -0600

Here's a lower-level patch. My adhoc testing against svn's repo and
perian's indicates this works, but I'd appreciate it if someone could
run it through automated tests (which I don't have set up for dav
tests) before accepting the patch.

Peace,
Augie

[[[
Fix a bug in ra_serf where the computed repository root was not
canonical,
which caused working copy corruption.

* subversion/libsvn_ra_serf/util.c
  (svn_ra_serf__discover_root): Canonicalize repos_root_str when
discovering the
    repository root.

Patch by: Augie Fackler: <durin42_at_gmail.com>
]]]

Index: subversion/libsvn_ra_serf/util.c
===================================================================
--- subversion/libsvn_ra_serf/util.c (revision 29127)
+++ subversion/libsvn_ra_serf/util.c (working copy)
@@ -1218,6 +1218,9 @@
        session->repos_root.path = apr_pstrdup(session->pool, url_buf-
>data);
        session->repos_root_str = apr_uri_unparse(session->pool,
                                                  &session-
>repos_root, 0);
+ /* Canonicalize the string, otherwise we create corrupt WC
entries */
+ session->repos_root_str = svn_path_canonicalize(session-
>repos_root_str,
+ pool);
      }

    if (rel_path)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-02-01 21:12:55 CET

This is an archived mail posted to the Subversion Dev mailing list.