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

[PATCH] Fix a regression from 1.4 in trunk and branch (was: Regression in trunk from 1.4, some checkouts failing)

From: Augie Fackler <durin42_at_gmail.com>
Date: Wed, 30 Jan 2008 14:36:58 -0600

I have a simple one-line patch that fixes the issue for me. It appears
the problem occurred when the repo root was also the server root the
repo root was declared in entries to be "http://svn.example.com/" but
should have been "http://svn.example.com" according to
svn_path_canonicalize(). I just tested this against svn.perian.org and
the checkout worked as expected from there.
Peace,
Augie

[[[
Fix a regression from 1.4 where corrupt WC entries would be generated
if the
server root and the repository root were the same.

* subversion/libsvn_wc/entries.c
   (write_entry): Call svn_path_canonicalize() on the repository root
path before
    writing to entries.

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

Index: subversion/libsvn_wc/entries.c
===================================================================
--- subversion/libsvn_wc/entries.c (revision 29086)
+++ subversion/libsvn_wc/entries.c (working copy)
@@ -1538,9 +1539,9 @@
            || (this_dir->repos == NULL
                || (entry->repos
                    && strcmp(this_dir->repos, entry->repos) != 0))))
- valuestr = entry->repos;
+ valuestr = svn_path_canonicalize(entry->repos, pool);
    else
      valuestr = NULL;
    write_str(buf, valuestr, pool);

    /* Schedule. */

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-01-30 21:37:10 CET

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