You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Philip Martin <ph...@codematters.co.uk> on 2004/12/03 02:26:29 UTC
1.2 client is incompatible with 1.1 mod_dav_svn
Using trunk I get this
$ svn co http://svn.collab.net/repos/svn/trunk/tools qq
$ svn sw http://svn.collab.net/repos/svn/trunk/tools/dev qq/dev
../svn/subversion/libsvn_wc/lock.c:642: (apr_err=155005)
svn: Working copy '../svn/tools/iz' not locked
The error mentions "../svn/tools/iz" and there is no such path, it's
missing a "dev" component. A quick check with the debugger shows that
libsvn_client/ra.c:set_wc_prop is constructing bogus paths.
Reverting r12006
$ svn merge -r12006:12005 subversion/libsvn_ra_dav/fetch.c subversion/libsvn_ra_dav/fetch.c
causes the switch error to go away.
If I import trunk/tools into a private repository then I can do the
switch using a trunk version of mod_dav_svn, so it looks like a trunk
client is no longer compatible with a 1.1 server.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: 1.2 client is incompatible with 1.1 mod_dav_svn
Posted by Ben Collins-Sussman <su...@collab.net>.
On Dec 2, 2004, at 10:32 PM, C. Michael Pilato wrote:
>
> Be careful that what you *perceive* as 1.2-minus-r12006 as "working"
> truly is -- chances are very good that your wcprops contain incorrect
> version resource URLs.
Ah yes, I remember this now. It was a question of: which is worse?
'svn switch' producing a silently corrupted working copy, or 'svn
switch' just erroring?
Glad that there's a saner solution.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: 1.2 client is incompatible with 1.1 mod_dav_svn
Posted by Philip Martin <ph...@codematters.co.uk>.
"C. Michael Pilato" <cm...@collab.net> writes:
> Actually, I think Philip just committed a change which might make this
> whole thing irrelevant.
No, I don't think it does. I was seeing the client write a wcprops
file it tools/.svn/wcprops/ for files in the tools/iz/, now I get the
error
$ svn sw https://svn.collab.net/repos/svn/trunk/tools/dev qq/dev
../svn/subversion/libsvn_client/ra.c:179: (apr_err=200005)
svn: 'qq/random-commits.py' is not under version control
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: 1.2 client is incompatible with 1.1 mod_dav_svn
Posted by SteveKing <st...@wagner-group.ch>.
C. Michael Pilato wrote:
> SteveKing <st...@wagner-group.ch> writes:
>
>
>>Well, that's maybe a workaround for the command line client. But what
>>about all other Subversion clients which use absolute paths (and
>>sometimes _have_ to use absolute paths)?
>
>
> Oh, *you* guys again... ;-)
>
> Actually, I think Philip just committed a change which might make this
> whole thing irrelevant. If you get a chance, Stefan, can you see if
> TortoiseSVN running 1.2 code can survive a switch of a subdirectory
> against a 1.1 server?
I'll try this weekend. I already have a 1.1 server for testing set up at
home, so I guess I just have to build TSVN against 1.2 and try the switch.
/me waiting for my new laptop to arrive, so that a complete rebuild of
TSVN doesn't take > 2 hours anymore...
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: 1.2 client is incompatible with 1.1 mod_dav_svn
Posted by "C. Michael Pilato" <cm...@collab.net>.
SteveKing <st...@wagner-group.ch> writes:
> Well, that's maybe a workaround for the command line client. But what
> about all other Subversion clients which use absolute paths (and
> sometimes _have_ to use absolute paths)?
Oh, *you* guys again... ;-)
Actually, I think Philip just committed a change which might make this
whole thing irrelevant. If you get a chance, Stefan, can you see if
TortoiseSVN running 1.2 code can survive a switch of a subdirectory
against a 1.1 server?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: 1.2 client is incompatible with 1.1 mod_dav_svn
Posted by SteveKing <st...@wagner-group.ch>.
C. Michael Pilato wrote:
> The workaround for the problem you now see should be straightforward:
>
> (cd qq/dev; svn sw http://svn.collab.net/repos/svn/trunk/tools/dev)
Well, that's maybe a workaround for the command line client. But what
about all other Subversion clients which use absolute paths (and
sometimes _have_ to use absolute paths)?
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: 1.2 client is incompatible with 1.1 mod_dav_svn
Posted by Philip Martin <ph...@codematters.co.uk>.
"C. Michael Pilato" <cm...@collab.net> writes:
> Philip Martin <ph...@codematters.co.uk> writes:
>
>> Using trunk I get this
>>
>> $ svn co http://svn.collab.net/repos/svn/trunk/tools qq
>>
>> $ svn sw http://svn.collab.net/repos/svn/trunk/tools/dev qq/dev
>> ../svn/subversion/libsvn_wc/lock.c:642: (apr_err=155005)
>> svn: Working copy '../svn/tools/iz' not locked
>
> This is intentional, and the dev-list was forewarned when I posted the
> patch for this change and let it sit for almost two weeks before
> committing.
>
> http://svn.haxx.se/dev/archive-2004-11/0724.shtml
With the subject "[PATCH] Issue #2124". I guess I ignored it as I
didn't realise it was important, it certainly didn't provoke any
discussion.
> Be careful that what you *perceive* as 1.2-minus-r12006 as "working"
> truly is -- chances are very good that your wcprops contain incorrect
> version resource URLs. This hidden incorrectness causes at least
> working copies which actually don't work for many ra-dav operations,
> or worse, can actually cause commits to modify the wrong thing in the
> repository (an edge case, but possible). There are server bugs in 1.0
> and 1.1, but they were never triggered. The 1.1 client actually
> introduced this bad behavior by exposing the server bugs. It's
> complicated.
>
> The workaround for the problem you now see should be straightforward:
>
> (cd qq/dev; svn sw http://svn.collab.net/repos/svn/trunk/tools/dev)
>
> After long discussion with sussman, we agreed to move forward with the
> r12006 change because a visible bug with a simple workaround is far
> less of a problem than a hidden bug with a tricky workaround. And
> again, this was all described in the patch I posted.
I read the log of r12006. Perhaps it's just me, but it doesn't really
make the compatibilty problems explicit, it certainly doesn't mention
1.2 or 1.1. It doesn't mention the work-around either; I'm not sure
whether the workaround is appropriate for the log message, but putting
it there might ensure it gets into CHANGES.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: 1.2 client is incompatible with 1.1 mod_dav_svn
Posted by "C. Michael Pilato" <cm...@collab.net>.
Philip Martin <ph...@codematters.co.uk> writes:
> Using trunk I get this
>
> $ svn co http://svn.collab.net/repos/svn/trunk/tools qq
>
> $ svn sw http://svn.collab.net/repos/svn/trunk/tools/dev qq/dev
> ../svn/subversion/libsvn_wc/lock.c:642: (apr_err=155005)
> svn: Working copy '../svn/tools/iz' not locked
This is intentional, and the dev-list was forewarned when I posted the
patch for this change and let it sit for almost two weeks before
committing.
http://svn.haxx.se/dev/archive-2004-11/0724.shtml
Be careful that what you *perceive* as 1.2-minus-r12006 as "working"
truly is -- chances are very good that your wcprops contain incorrect
version resource URLs. This hidden incorrectness causes at least
working copies which actually don't work for many ra-dav operations,
or worse, can actually cause commits to modify the wrong thing in the
repository (an edge case, but possible). There are server bugs in 1.0
and 1.1, but they were never triggered. The 1.1 client actually
introduced this bad behavior by exposing the server bugs. It's
complicated.
The workaround for the problem you now see should be straightforward:
(cd qq/dev; svn sw http://svn.collab.net/repos/svn/trunk/tools/dev)
After long discussion with sussman, we agreed to move forward with the
r12006 change because a visible bug with a simple workaround is far
less of a problem than a hidden bug with a tricky workaround. And
again, this was all described in the patch I posted.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org