You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Bert Huijben <B....@competence.biz> on 2008/02/19 10:01:05 UTC
Working copy format regression in 1.5.x branch and probably trunk
Hi,
While trying to apply the ankhsvn/NSvn test suite on my new SharpSvn
library I found a regression in the working copy parsing.
When I extract
http://www.ankhsvn.com/svn/finalproject/trunk/src/NSvn.Core.Tests/confli
ctwc.zip to a directory and run some svn command with 1.4.5 I get:
---- 1.4.5
# svn --version
svn, version 1.4.5 (r25188)
compiled Aug 22 2007, 20:49:04
# svn status
? Form.cs.r1
? Form.cs.r2
? Form.cs.mine
C Form.cs
When doing the same with 1.5.x I get
--- 1.5.x @29411
# svn --version
svn, version 1.5.0 (dev build)
compiled Feb 18 2008, 19:24:43
# svn status
svn: Missing default entry
(The problem disappears on 1.5 if I upgrade the working copy by using
the 1.4 client)
This working copy for this test case was generated with a very old
version of subversion (Probably 1.0 or 1.1) and contains an old xml
based entries file.
The workingcopy might be corrupted in some way, but has worked for
ankhsvn's testcases for quite a few subversion releases.
I will try to find the real problem this evening, but if somebody else
beats me to it...
Bert
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
RE: Working copy format regression in 1.5.x branch and probably trunk
Posted by Bert Huijben <B....@competence.biz>.
To close this issue completely (and for future reference) I provide the following information:
> -----Original Message-----
> From: Bert Huijben [mailto:bert@vmoo.com]
> The zipped working copy in the testcase has format 2. When subversion
> 1.0 was released the wc format used was 4. I will fix the issue by
> updating the zip as this is technically not a bug in subversion, but
> only an implementation change since 1.4. (Only 1.0++ compatibility is
> guaranteed)
# svn log -v -r 21597 http://svn.collab.net/repos/svn/trunk/
------------------------------------------------------------------------
r21597 | philip | 2006-09-21 22:43:26 +0200 (do, 21 sep 2006) | 3 lines
Changed paths:
M /trunk/subversion/libsvn_wc/entries.c
* subversion/libsvn_wc/entries.c
(svn_wc__atts_to_entry): Remove obsolete "svn:this_dir" support.
------------------------------------------------------------------------
# svn diff -r 21596:21597 http://svn.collab.net/repos/svn/trunk/subversion/lib
svn_wc/entries.c
Index: entries.c
===================================================================
--- entries.c (revision 21596)
+++ entries.c (revision 21597)
@@ -469,12 +469,6 @@
/* Find the name and set up the entry under that name. */
name = apr_hash_get(atts, SVN_WC__ENTRY_ATTR_NAME, APR_HASH_KEY_STRING);
- /* XXX Replace the obsolete "svn:this_dir".
- XXX This code should go away by 1.0 */
- {
- if (name && strcmp(name, "svn:this_dir") == 0)
- name = SVN_WC_ENTRY_THIS_DIR;
- }
entry->name = name ? apr_pstrdup(pool, name) : SVN_WC_ENTRY_THIS_DIR;
/* Attempt to set revision (resolve_to_defaults may do it later, too) */
>
> Bert
RE: Working copy format regression in 1.5.x branch and probably trunk
Posted by Bert Huijben <be...@vmoo.com>.
> -----Original Message-----
> From: Branko Čibej <br...@xbc.nu> [mailto:=?ISO-8859-
> 2?Q?Branko_=C8ibej_<br...@xbc.nu>?=]
> Sent: dinsdag 19 februari 2008 11:25
> To: Bert Huijben
> Cc: dev@subversion.tigris.org
> Subject: Re: Working copy format regression in 1.5.x branch and
> probably trunk
>
> Bert Huijben wrote:
> > Hi,
> >
> > While trying to apply the ankhsvn/NSvn test suite on my new SharpSvn
> > library I found a regression in the working copy parsing.
>
> This was so long ago I actually forgot that I made this change. :)
>
> -----------------------------------------------------------------------
> -
> r7711 | brane | 2003-11-12 08:41:50 +0100 (Wed, 12 Nov 2003) | 6 lines
>
> Use "" instead of "svn:this_dir" in the entries file.
>
> * subversion/include/svn_wc.h (SVN_WC_ENTRIES_THIS_DIR): Define to "".
> * subversion/libsvn_wc/entries.c (svn_wc__atts_to_entry): It the
> entry name is "svn:this_dir", change it to SVN_WC_ENTRIES_THIS_DIR.
The zipped working copy in the testcase has format 2. When subversion 1.0 was released the wc format used was 4. I will fix the issue by updating the zip as this is technically not a bug in subversion, but only an implementation change since 1.4. (Only 1.0++ compatibility is guaranteed)
I don't think I need to open an issue on this one.
--- snip subversion/libsvn_wc/wc.h ---
* The change from 3 to 4 was the renaming of the magic "svn:this_dir"
* entry name to "".
--- snip ---
Bert
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Working copy format regression in 1.5.x branch and probably trunk
Posted by Branko Čibej <br...@xbc.nu>.
Bert Huijben wrote:
> Hi,
>
> While trying to apply the ankhsvn/NSvn test suite on my new SharpSvn
> library I found a regression in the working copy parsing.
>
> When I extract
> http://www.ankhsvn.com/svn/finalproject/trunk/src/NSvn.Core.Tests/confli
> ctwc.zip to a directory and run some svn command with 1.4.5 I get:
>
> ---- 1.4.5
> # svn --version
> svn, version 1.4.5 (r25188)
> compiled Aug 22 2007, 20:49:04
> # svn status
> ? Form.cs.r1
> ? Form.cs.r2
> ? Form.cs.mine
> C Form.cs
>
> When doing the same with 1.5.x I get
>
> --- 1.5.x @29411
> # svn --version
> svn, version 1.5.0 (dev build)
> compiled Feb 18 2008, 19:24:43
> # svn status
> svn: Missing default entry
>
> (The problem disappears on 1.5 if I upgrade the working copy by using
> the 1.4 client)
>
> This working copy for this test case was generated with a very old
> version of subversion (Probably 1.0 or 1.1) and contains an old xml
> based entries file.
> The workingcopy might be corrupted in some way, but has worked for
> ankhsvn's testcases for quite a few subversion releases.
>
> I will try to find the real problem this evening, but if somebody else
> beats me to it...
>
This was so long ago I actually forgot that I made this change. :)
------------------------------------------------------------------------
r7711 | brane | 2003-11-12 08:41:50 +0100 (Wed, 12 Nov 2003) | 6 lines
Use "" instead of "svn:this_dir" in the entries file.
* subversion/include/svn_wc.h (SVN_WC_ENTRIES_THIS_DIR): Define to "".
* subversion/libsvn_wc/entries.c (svn_wc__atts_to_entry): It the
entry name is "svn:this_dir", change it to SVN_WC_ENTRIES_THIS_DIR.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org