You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Branko Čibej <br...@xbc.nu> on 2001/09/10 20:26:16 UTC

svn_path_*_style: More eyes, please ...

I'm looking for the multi-file commit bug on Windows, and noticed that 
the WC sometimes uses svn_path_repos_style to modify the "ancestor" URL. 
Could someone else check if this patch is O.K.? Thanks.

[brane@silmaril libsvn_wc]$ svn diff
Index: .\entries.c
===================================================================
--- .\SVN\text-base\entries.c   Fri Aug 31 23:32:26 2001
+++ .\entries.c Mon Sep 10 22:19:41 2001
@@ -395,7 +395,7 @@
                                          APR_HASH_KEY_STRING);
       dst->ancestor = svn_stringbuf_dup (src->ancestor, pool);
       svn_path_add_component (dst->ancestor, name,
-                              svn_path_repos_style);
+                              svn_path_url_style);
     }
 }

@@ -917,7 +917,7 @@
             {
               this_path = svn_stringbuf_dup (this_dir->ancestor, pool);
               svn_path_add_component_nts (this_path, this_entry_name,
-                                          svn_path_repos_style);
+                                          svn_path_url_style);
               if (svn_stringbuf_compare (this_path, this_entry->ancestor))
                 apr_hash_set (this_entry->attributes,
                               SVN_WC_ENTRY_ATTR_ANCESTOR,
Index: .\adm_ops.c
===================================================================
--- .\SVN\text-base\adm_ops.c   Sat Sep  8 14:13:17 2001
+++ .\adm_ops.c Mon Sep 10 22:18:48 2001
@@ -598,7 +598,7 @@

   /* Derive the ancestor path for our new addition here. */
   ancestor_path = svn_stringbuf_dup (entry->ancestor, pool);
-  svn_path_add_component (ancestor_path, basename, svn_path_repos_style);
+  svn_path_add_component (ancestor_path, basename, svn_path_url_style);

   /* Make sure this new directory has an admistrative subdirectory
      created inside of it */



-- 
Brane �ibej   <br...@xbc.nu>            http://www.xbc.nu/brane/



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn_path_*_style: More eyes, please ...

Posted by cm...@collab.net.
Branko =?ISO-8859-2?Q?=C8ibej?= <br...@xbc.nu> writes:

> I'm looking for the multi-file commit bug on Windows, and noticed that 
> the WC sometimes uses svn_path_repos_style to modify the "ancestor" URL. 
> Could someone else check if this patch is O.K.? Thanks.

Looks good to me.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn_path_*_style: More eyes, please ...

Posted by Branko Čibej <br...@xbc.nu>.
Greg Stein wrote:

>On Mon, Sep 10, 2001 at 10:26:16PM +0200, Branko E`ibej wrote:
>
>>I'm looking for the multi-file commit bug on Windows, and noticed that 
>>the WC sometimes uses svn_path_repos_style to modify the "ancestor" URL. 
>>Could someone else check if this patch is O.K.? Thanks.
>>
>
>Well, functionally, it should be fine since both styles use "/". However,
>the WC should *never* use repos_style. It should either be url_style or
>local_style. Always.
>
>So I'd say that the change *must* be correct. If it causes other problems,
>then we simply have other problems :-)
>

O.K., committed. Thanks.

-- 
Brane �ibej <br...@xbc.nu> http://www.xbc.nu/brane/




---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn_path_*_style: More eyes, please ...

Posted by Greg Stein <gs...@lyra.org>.
On Mon, Sep 10, 2001 at 10:26:16PM +0200, Branko �ibej wrote:
> I'm looking for the multi-file commit bug on Windows, and noticed that 
> the WC sometimes uses svn_path_repos_style to modify the "ancestor" URL. 
> Could someone else check if this patch is O.K.? Thanks.

Well, functionally, it should be fine since both styles use "/". However,
the WC should *never* use repos_style. It should either be url_style or
local_style. Always.

So I'd say that the change *must* be correct. If it causes other problems,
then we simply have other problems :-)

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