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/05 22:08:39 UTC
Update problems on Windows: $#"@! svn_path_local_style
The more I tried to update anything outside the WC root on Windows, the
more it kept failing. "Now," I said to myself, "Why can I update
./AUTHORS, but not ,/ac-helpers/berkeley-db.m4?"
And here it is:
> type ac-helpers/SVN/entries
<?xml version="1.0" encoding="utf-8"?>
<wc-entries
xmlns="svn:">
<entry
name="svn:this_dir"
kind="dir"
revision="17"
ancestor="http://svn.collab.net/repos/svn/trunk\ac-helpers"/>
...
Urgh. The ancestor path should have been pasted using svn_path_url_style.
--
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: WindWoes
Posted by Branko Čibej <br...@xbc.nu>.
Ben Collins-Sussman wrote:
>Branko =?ISO-8859-2?Q?=C8ibej?= <br...@xbc.nu> writes:
>
>>Now I can't commit an added file, and this time it's nothing to do with
>>path separators. Any ideas?
>>
>>svn_error: #21073 : <RA layer's server request failed>
>> commit failed: wc locks have been removed.
>>
>>svn_error: #21073 : <RA layer's server request failed>
>> commit failed: while sending tree-delta.
>>
>>svn_error: #21073 : <RA layer's server request failed>
>> The CHECKOUT request failed (http #409) (/repos/svn/$svn/ver/275.1/trunk/subversion/include)
>>
>
>Looks like the commit is trying to open node-rev-id 275.1. I wonder
>if your problem is related to issue #487?
>
Yep, that was it. I edited SVN/dir-wcprops, and now the commit succeded.
That prop still isn't changed after an update, even though a file was
added, so the dir should get a new revision.
--
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: WindWoes
Posted by Ben Collins-Sussman <su...@collab.net>.
Branko =?ISO-8859-2?Q?=C8ibej?= <br...@xbc.nu> writes:
> Now I can't commit an added file, and this time it's nothing to do with
> path separators. Any ideas?
>
> svn_error: #21073 : <RA layer's server request failed>
> commit failed: wc locks have been removed.
>
> svn_error: #21073 : <RA layer's server request failed>
> commit failed: while sending tree-delta.
>
> svn_error: #21073 : <RA layer's server request failed>
> The CHECKOUT request failed (http #409) (/repos/svn/$svn/ver/275.1/trunk/subversion/include)
Looks like the commit is trying to open node-rev-id 275.1. I wonder
if your problem is related to issue #487?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: WindWoes
Posted by Branko Čibej <br...@xbc.nu>.
Now I can't commit an added file, and this time it's nothing to do with
path separators. Any ideas?
svn_error: #21073 : <RA layer's server request failed>
commit failed: wc locks have been removed.
svn_error: #21073 : <RA layer's server request failed>
commit failed: while sending tree-delta.
svn_error: #21073 : <RA layer's server request failed>
The CHECKOUT request failed (http #409) (/repos/svn/$svn/ver/275.1/trunk/subversion/include)
--
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: WindWoes
Posted by cm...@collab.net.
Branko =?ISO-8859-2?Q?=C8ibej?= <br...@xbc.nu> writes:
> And before you ask: I'm going through this Windows hell on purpose,
> because I want to boldly debug where no man hath debugged before. Yes, I
> *could* boot into Linux and never see these problems -- but most
> everybody else is doing that, so what's the point?
Hey, I'll be doing the Windows debug thing, too (with NO CYGWIN) as
soon I get time to build that binary!
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: WindWoes
Posted by Greg Stein <gs...@lyra.org>.
On Fri, Sep 07, 2001 at 12:18:59AM +0200, Branko �ibej wrote:
> Sorry about this stream-of-consciousness thingy, I'm in sort of a whimsy
> mood right now. :-)
>
> And before you ask: I'm going through this Windows hell on purpose,
> because I want to boldly debug where no man hath debugged before. Yes, I
> *could* boot into Linux and never see these problems -- but most
> everybody else is doing that, so what's the point?
Go go go!
thanks :-)
-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
Re: WindWoes
Posted by Branko Čibej <br...@xbc.nu>.
Sorry about this stream-of-consciousness thingy, I'm in sort of a whimsy
mood right now. :-)
And before you ask: I'm going through this Windows hell on purpose,
because I want to boldly debug where no man hath debugged before. Yes, I
*could* boot into Linux and never see these problems -- but most
everybody else is doing that, so what's the point?
--
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: WindWoes [was: Update problems on Windows: $#"@! svn_path_local_style]
Posted by Branko Čibej <br...@xbc.nu>.
Ben Collins-Sussman wrote:
>I expect 'svn diff' doesn't work because this subcommand tries to fork
>an external GNU Diff program. Does that mean anything in Windows?
>How does our MSVC setup deal with this requirement?
>
Heh. Turned out that 'svn diff' didn't work because of a bug in APR.
Wrowe fixed part of it, and I just committed a fix for the rest. 'svn
diff' now works on Windows with a fresh APR and current svn.
Also, wrowe beat me on most of the needed apr_fileinfo_get() changes,
and I just committed the bits that were missing. So checkout, update and
(single file) commit all work on Windows.
Next step: Multi-file commits. Another wrong svn_path_*_style somewhere
in the wcprops stuff.
--
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: WindWoes [was: Update problems on Windows: $#"@! svn_path_local_style]
Posted by Branko Čibej <br...@xbc.nu>.
Ben Collins-Sussman wrote:
>Branko =?ISO-8859-2?Q?=C8ibej?= <br...@xbc.nu> writes:
>
>
>>That's it. I'm not touching this stuff again today. I'll just post those
>>patches to the list and let somebody else commit, thanks. Why aren't I
>>using "svn diff", you ask? Oh, because it doesn't work for me right now,
>>of course. Always shows an empty diff.
>>
>
>Branko, you're our Win32 guinea pig, and we thank you!
>
>I expect 'svn diff' doesn't work because this subcommand tries to fork
>an external GNU Diff program. Does that mean anything in Windows?
>
It does mean something if you happen to have cygwin installed, as I do.
And it worked for me a couple of days ago. Just a buglet, I suspect,
probably (again) related to path styles.
>How does our MSVC setup deal with this requirement?
>
<hack
location="svn_private_config.hw"
customize="modify diff and patch path; rebuild svn"
help-string="Read HACKING: Building on Win32"/>
:-)
--
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: WindWoes
Posted by Ben Collins-Sussman <su...@collab.net>.
Branko =?ISO-8859-2?Q?=C8ibej?= <br...@xbc.nu> writes:
> Ben Collins-Sussman wrote:
>
> >Branko, you're our Win32 guinea pig, and we thank you!
> >
>
> This pig is worth more than a guinea! A pound and a half at least, what?
Once we get these Win32 kinks worked out, I'd love to start posting
some large static binaries to our website -- maybe one for Linux,
FreeBSD, and you can post a Win32 binary. Mmmmm.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: WindWoes
Posted by Branko Čibej <br...@xbc.nu>.
Ben Collins-Sussman wrote:
>Branko, you're our Win32 guinea pig, and we thank you!
>
This pig is worth more than a guinea! A pound and a half at least, what?
--
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: WindWoes [was: Update problems on Windows: $#"@! svn_path_local_style]
Posted by Ben Collins-Sussman <su...@collab.net>.
Branko =?ISO-8859-2?Q?=C8ibej?= <br...@xbc.nu> writes:
> That's it. I'm not touching this stuff again today. I'll just post those
> patches to the list and let somebody else commit, thanks. Why aren't I
> using "svn diff", you ask? Oh, because it doesn't work for me right now,
> of course. Always shows an empty diff.
Branko, you're our Win32 guinea pig, and we thank you!
I expect 'svn diff' doesn't work because this subcommand tries to fork
an external GNU Diff program. Does that mean anything in Windows?
How does our MSVC setup deal with this requirement?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
WindWoes [was: Update problems on Windows: $#"@! svn_path_local_style]
Posted by Branko Čibej <br...@xbc.nu>.
Man oh man ... and to think we all thought that path style magic was a
neat idea.
O.K., I apply Mike's patch and try a small "svn up" ... Hey, it's
actually pulling things off the serv -- Oh, it crashed. Hmmm (debug
debug trace trace) ... what, a NULL entry? Why is it trying to set the
current revision on .\./install.sh? ... Aha!
* subversion/libsvn_wc/adm_ops.c
(svn_wc__ensure_uniform_revision): Use svn_path_local_style.
diff -up subversion/libsvn_wc/SVN/text-base/adm_ops.c subversion/libsvn_wc/adm_ops.c
--- subversion/libsvn_wc/SVN/text-base/adm_ops.c Thu Sep 6 21:46:31 2001
+++ subversion/libsvn_wc/adm_ops.c Thu Sep 6 22:26:54 2001
@@ -115,7 +115,7 @@ svn_wc__ensure_uniform_revision (svn_str
full_entry_path = svn_stringbuf_dup (dir_path, subpool);
if (current_entry_name)
svn_path_add_component (full_entry_path, current_entry_name,
- svn_path_url_style);
+ svn_path_local_style);
/* If the entry's existence is `deleted', remove the entry
altogether. (If, during the update, the repository didn't
Wow, I can update the whole tree now, how cool. Right. I have a few
small changes in my WC, let's commit those:
$ svn ci svn_private_config.h -m "(SVN_VERSION): Bump to M3."
apr_error: #22623, src_err 0 : <The filename, directory name, or volume label syntax is incorrect. >
svn_wc__wcprop_get: failed to load props from disk.
apr_error: #22623, src_err 0 : <The filename, directory name, or volume label syntax is incorrect. >
svn_io_check_path: problem checking path "c:/Home/brane/sources/subversion/svn-repo/trunk\."
Eh? (debug debug trace trace) Oh, look what I found. Naughty, naughty.
* subversion/libsvn_subr/target.c
(svn_path_get_absolute): Really pass some flags to apr_filepath_merge.
diff -up subversion/libsvn_subr/SVN/text-base/target.c subversion/libsvn_subr/target.c
--- subversion/libsvn_subr/SVN/text-base/target.c Thu Sep 6 21:46:12 2001
+++ subversion/libsvn_subr/target.c Thu Sep 6 23:01:53 2001
@@ -39,9 +39,10 @@ svn_path_get_absolute(svn_stringbuf_t **
{
char * buffer;
int apr_err = apr_filepath_merge(&buffer, NULL, relative->data,
- APR_FILEPATH_NOTRELATIVE &
- APR_FILEPATH_NATIVE &
- APR_FILEPATH_TRUENAME, pool);
+ APR_FILEPATH_NOTRELATIVE
+ | APR_FILEPATH_NATIVE
+ | APR_FILEPATH_TRUENAME,
+ pool);
if (apr_err == APR_SUCCESS)
{
*pabsolute = svn_stringbuf_create(buffer, pool);
O.K., committing again. What? Same error? Howzat? Aargh ... saith
apr/file_io/win32/filesys.c:
> /* ###: We really should consider adding a flag to allow the user
> * to have the APR_FILEPATH_NATIVE result
> */
> for (*rootpath = path; **rootpath; ++*rootpath) {
> if (**rootpath == '\\')
> **rootpath = '/';
> }
That's it. I'm not touching this stuff again today. I'll just post those
patches to the list and let somebody else commit, thanks. Why aren't I
using "svn diff", you ask? Oh, because it doesn't work for me right now,
of course. Always shows an empty diff.
BTW, see issues 488 and 489,
--
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: Update problems on Windows: $#"@! svn_path_local_style
Posted by Branko Čibej <br...@xbc.nu>.
Yep, that does it for the checkout. Commit it, commit it!
cmpilato@collab.net wrote:
>Branko =?ISO-8859-2?Q?=C8ibej?= <br...@xbc.nu> writes:
>
>>Yeah. Even more embarrassing: I can't seem to find my way through the
>>maze of twisty editors, all alike, to find where exactly this is happening.
>>
>>Help!
>>
>
>Hey, Branko, give this patch a shot:
>
>Index: ./trunk/subversion/libsvn_wc/get_editor.c
>===================================================================
>--- ./trunk/subversion/libsvn_wc/SVN/text-base/get_editor.c Tue Sep 4 09:25:59 2001
>+++ ./trunk/subversion/libsvn_wc/get_editor.c Thu Sep 6 13:54:08 2001
>@@ -563,8 +563,9 @@
> SVN_ERR (svn_wc_entry (&parent_entry,
> parent_dir_baton->path,
> parent_dir_baton->pool));
>- new_URL = svn_stringbuf_dup (parent_entry->ancestor, this_dir_baton->pool);
>- svn_path_add_component (new_URL, name, svn_path_local_style);
>+ new_URL = svn_stringbuf_dup (parent_entry->ancestor,
>+ this_dir_baton->pool);
>+ svn_path_add_component (new_URL, name, svn_path_url_style);
>
> copyfrom_path = new_URL;
> copyfrom_revision = parent_dir_baton->edit_baton->target_revision;
>@@ -1831,7 +1832,7 @@
> svn_stringbuf_t *my_ancestry = svn_stringbuf_dup (p_entry->ancestor,
> pool);
>
>- svn_path_add_component (my_ancestry, basename, svn_path_repos_style);
>+ svn_path_add_component (my_ancestry, basename, svn_path_url_style);
>
> if (svn_stringbuf_compare (my_ancestry, my_entry->ancestor))
> {
>
--
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: Update problems on Windows: $#"@! svn_path_local_style
Posted by cm...@collab.net.
Branko =?ISO-8859-2?Q?=C8ibej?= <br...@xbc.nu> writes:
> Yeah. Even more embarrassing: I can't seem to find my way through the
> maze of twisty editors, all alike, to find where exactly this is happening.
>
> Help!
Hey, Branko, give this patch a shot:
Index: ./trunk/subversion/libsvn_wc/get_editor.c
===================================================================
--- ./trunk/subversion/libsvn_wc/SVN/text-base/get_editor.c Tue Sep 4 09:25:59 2001
+++ ./trunk/subversion/libsvn_wc/get_editor.c Thu Sep 6 13:54:08 2001
@@ -563,8 +563,9 @@
SVN_ERR (svn_wc_entry (&parent_entry,
parent_dir_baton->path,
parent_dir_baton->pool));
- new_URL = svn_stringbuf_dup (parent_entry->ancestor, this_dir_baton->pool);
- svn_path_add_component (new_URL, name, svn_path_local_style);
+ new_URL = svn_stringbuf_dup (parent_entry->ancestor,
+ this_dir_baton->pool);
+ svn_path_add_component (new_URL, name, svn_path_url_style);
copyfrom_path = new_URL;
copyfrom_revision = parent_dir_baton->edit_baton->target_revision;
@@ -1831,7 +1832,7 @@
svn_stringbuf_t *my_ancestry = svn_stringbuf_dup (p_entry->ancestor,
pool);
- svn_path_add_component (my_ancestry, basename, svn_path_repos_style);
+ svn_path_add_component (my_ancestry, basename, svn_path_url_style);
if (svn_stringbuf_compare (my_ancestry, my_entry->ancestor))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Update problems on Windows: $#"@! svn_path_local_style
Posted by Ben Collins-Sussman <su...@collab.net>.
Branko =?ISO-8859-2?Q?=C8ibej?= <br...@xbc.nu> writes:
> Yeah. Even more embarrassing: I can't seem to find my way through the
> maze of twisty editors, all alike, to find where exactly this is happening.
Layman's Guide to Existing `Editors'
------------------------------------
* "update editor"
Lives in libsvn_wc/get_editor.c. This is the only editor ever
used to modify your working copy. It's driven by the RA layer
during checkouts and updates.
* "commit editor"
Lives in libsvn_repos. This is the editor driven directly by
ra_local during a commit; it talks directly to libsvn_fs and
builds a transaction that looks like the working copy -- then
ultimately calls 'svn_repos_commit_txn', which merges the
transaction against the HEAD revision, and ultimately promotes the
transaction into the newest revision.
* "XML editor"
Lives in libsvn_delta. Not really used much anymore, although it
still seems to pass tests. It was originally used for Milestone
1, before we had a filesystem. It's an editor that produces a
custom XML-patch format; the delta library also has code for
parsing this patch format and driving an editor (so you can update
your working copy from one of these patches.)
* ? editors in the networking layer
I don't know this code yet, but I suspect that libsvn_ra_dav has
its own commit-editor that produces DAV request bodies (xml) to
send to Apache. On the other end, mod_dav_svn parses the body and
builds a commit transaction.
Similarly, for updates, I believe mod_dav_svn has an editor driven
by svn_repos_dir_delta() that produces DAV response bodies (xml).
On the other end, ra_dav parses the body and then drives the
`update' editor.
* svnlook's editor
Ask cmpilato. svnlook allows you to examine a repository; it's
the tool generating our commit emails. I believe it has a fancy
editor (being driven by svn_repos_dir_delta()) that produces neato
linked lists of tree nodes in memory.
* `trace' editors
The command-line client has an editor that knows how to print {U,
G, C, A, D} during checkouts/updates, and another editor that
knows how to print {Sending, Deleting, Adding} during commits.
These editors are "composed" with the editors that do the real
work. Neat thing, editor composition.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Update problems on Windows: $#"@! svn_path_local_style
Posted by Branko Čibej <br...@xbc.nu>.
Ben Collins-Sussman wrote:
>Branko =?ISO-8859-2?Q?=C8ibej?= <br...@xbc.nu> writes:
>
>> ancestor="http://svn.collab.net/repos/svn/trunk\ac-helpers"/>
>>
>>
>>Urgh. The ancestor path should have been pasted using svn_path_url_style.
>>
>
>Gah! And I saw those errors flying by, too! (I keep a terminal on
>svn.collab.net open, running 'tail -f /var/log/httpd/error_log'):
>
>[Wed Sep 05 15:38:07 2001] [error] [client 213.143.69.107] file not
>found: filesystem `/usr/www/repositories/svn/db', revision `52', path
>`/trunk\expat-lite/hashtable.c' [500, #21048]
>
>How embarrassing.
>
Yeah. Even more embarrassing: I can't seem to find my way through the
maze of twisty editors, all alike, to find where exactly this is happening.
Help!
If anyone can give me a pointer about where to start looking, I'd be
much obliged ...
--
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: Update problems on Windows: $#"@! svn_path_local_style
Posted by Ben Collins-Sussman <su...@collab.net>.
Branko =?ISO-8859-2?Q?=C8ibej?= <br...@xbc.nu> writes:
> ancestor="http://svn.collab.net/repos/svn/trunk\ac-helpers"/>
>
>
> Urgh. The ancestor path should have been pasted using svn_path_url_style.
>
Gah! And I saw those errors flying by, too! (I keep a terminal on
svn.collab.net open, running 'tail -f /var/log/httpd/error_log'):
[Wed Sep 05 15:38:07 2001] [error] [client 213.143.69.107] file not
found: filesystem `/usr/www/repositories/svn/db', revision `52', path
`/trunk\expat-lite/hashtable.c' [500, #21048]
How embarrassing.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org