You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Joe Swatosh <jo...@gmail.com> on 2009/10/17 05:02:57 UTC
r39592
Hi Bert,
Sorry I wasn't able to reply to the commit message, I couldn't find it
anywhere among my messages.
This commit causes some ruby bindings test failures. I instrumented
one of the tests with some logging
to put out the current status of the working copy by shelling out to
the command line svn. The traces are
immediately before and after the call to svn_client_resolve. At
r39591 it looks like:
test/run-test.rb test/test_client.rb -v -n"/_resolve_base/"
Loaded suite test_client.rb
Started
test_resolve_base(SvnClientTest):
C C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt
? C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt.r1
? C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt.r2
? C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt.mine
M C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt
.
Finished in 5.26 seconds.
1 tests, 6 assertions, 0 failures, 0 errors
after r39592:
test/run-test.rb test/test_client.rb -v -n"/_resolve_base/"
Loaded suite test_client.rb
Started
test_resolve_base(SvnClientTest):
C C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt
? C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt.r1
? C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt.r2
? C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt.mine
C C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt
? C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt.r1
? C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt.r2
? C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt.mine
F
Finished in 6.407 seconds.
1) Failure:
test_resolve_base(SvnClientTest)
C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_client.rb:2383:in
`test_resolve_base'
C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_client.rb:2376:in
`assert_resolve'
C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/test/util.rb:183:in
`make_context'
C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_client.rb:2348:in
`assert_resolve'
C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_client.rb:2381:in
`test_resolve_base':
Exception raised:
Class: <Svn::Error::WcFoundConflict>
Message: <"\nC:\\Users\\joe-swatosh\\Documents\\SVN\\src-trunk\\subversion\\libsvn_client\\commit_util.c:457:
Svn::Error::WcFoundConflict: Aborting comm
it: 'C:\\Users\\JOE-SW~1\\AppData\\Local\\Temp\\wc-tmp\\wc\\dir\\sample.txt'
remains in conflict">
---Backtrace---
./svn/util.rb:86:in `svn_client_commit4'
./svn/util.rb:86:in `commit4'
C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/svn/client.rb:166:in
`ci'
C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_client.rb:2384:in
`test_resolve_base'
C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_client.rb:2383:in
`test_resolve_base'
C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_client.rb:2376:in
`assert_resolve'
C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/test/util.rb:183:in
`make_context'
C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_client.rb:2348:in
`assert_resolve'
C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_client.rb:2381:in
`test_resolve_base'
---------------
1 tests, 3 assertions, 1 failures, 0 errors
So it appears that svn_client_resolve isn't changing anything in the
working copy anymore?
I didn't try to read too much of subversion/libsvn_wc/adm_ops.c, I was
hoping this would be fresh enough that you could figure it out.
Thanks,
--
Joe
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2408438
Re: r39592
Posted by Joe Swatosh <jo...@gmail.com>.
On Sat, Oct 17, 2009 at 8:39 AM, Bert Huijben <be...@qqmail.nl> wrote:
>
>
>> -----Original Message-----
>>
>
> Hi,
>
> Thanks for looking into this.
>
> I'll verify the 1.6 behavior and I will change the depth unknown behavior to
> infinity after confirming your findings.
>
Great (and already done!)
>
> BTW. There was some on-irc talk about the svn_wc_ensure_adm() behavior on no
> longer allowing NULL uuid and repository root.
>
> The idea was (if I remember correctly) to disallow uuid and repository empty
> on a completely standalone working copies (like the one in the ruby test),
> but to try copying the data from its parent directory if that is a working
> copy. (And probably write an erratum to explain the behavior change).
>
> I don't think the copying from parent part is implemented yet, but the WC-NG
> data model doesn't allow working copies without repository/uuid. So it would
> be very hard to support the old behavior.. Which would give you a mostly
> unusable working copy anyway.
>
Thanks for the update, Bert. I don't have any skin in this game: I can make
the Ruby bindings tests pass as things stand now, if that is the
descision. But
I'm glad to hear it is getting attention because (from my my naive
POV) it would
seem to break the backward compatibility guarantees. Not that breaking them
can't be done, but that it be done thoughtfully.
Thanks again for the quick response.
--
Joe
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2408672
RE: r39592
Posted by Bert Huijben <rh...@sharpsvn.net>.
> -----Original Message-----
> From: Joe Swatosh [mailto:joe.swatosh@gmail.com]
> Sent: zaterdag 17 oktober 2009 17:32
> To: SVN Dev; Bert Huijben
> Subject: Re: r39592
>
> Hi Bert,
>
> I know I should sleep on it instead of sending right before bed.
>
> There are two things going on:
> First, there is a bug in the ruby bindings tests (misspelling
> "infinity" as "infinite" so the bindings translate it as "unknown").
> Second, svn_client_resolve now no longer treats depth unknown as depth
> infinity.
>
> I will fix the first issue.
> I'm not sure the second issue is a problem or just a change.....
Hi,
Thanks for looking into this.
I'll verify the 1.6 behavior and I will change the depth unknown behavior to
infinity after confirming your findings.
BTW. There was some on-irc talk about the svn_wc_ensure_adm() behavior on no
longer allowing NULL uuid and repository root.
The idea was (if I remember correctly) to disallow uuid and repository empty
on a completely standalone working copies (like the one in the ruby test),
but to try copying the data from its parent directory if that is a working
copy. (And probably write an erratum to explain the behavior change).
I don't think the copying from parent part is implemented yet, but the WC-NG
data model doesn't allow working copies without repository/uuid. So it would
be very hard to support the old behavior.. Which would give you a mostly
unusable working copy anyway.
Bert
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2408532
Re: r39592
Posted by Joe Swatosh <jo...@gmail.com>.
Hi Bert,
I know I should sleep on it instead of sending right before bed.
There are two things going on:
First, there is a bug in the ruby bindings tests (misspelling
"infinity" as "infinite" so the bindings translate it as "unknown").
Second, svn_client_resolve now no longer treats depth unknown as depth infinity.
I will fix the first issue.
I'm not sure the second issue is a problem or just a change.....
--
Joe
On Fri, Oct 16, 2009 at 10:02 PM, Joe Swatosh <jo...@gmail.com> wrote:
> Hi Bert,
>
> Sorry I wasn't able to reply to the commit message, I couldn't find it
> anywhere among my messages.
>
> This commit causes some ruby bindings test failures. I instrumented
> one of the tests with some logging
> to put out the current status of the working copy by shelling out to
> the command line svn. The traces are
> immediately before and after the call to svn_client_resolve. At
> r39591 it looks like:
>
> test/run-test.rb test/test_client.rb -v -n"/_resolve_base/"
> Loaded suite test_client.rb
> Started
> test_resolve_base(SvnClientTest):
> C C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt
> ? C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt.r1
> ? C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt.r2
> ? C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt.mine
>
> M C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt
>
> .
>
> Finished in 5.26 seconds.
>
> 1 tests, 6 assertions, 0 failures, 0 errors
>
>
> after r39592:
>
> test/run-test.rb test/test_client.rb -v -n"/_resolve_base/"
> Loaded suite test_client.rb
> Started
> test_resolve_base(SvnClientTest):
> C C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt
> ? C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt.r1
> ? C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt.r2
> ? C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt.mine
>
> C C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt
> ? C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt.r1
> ? C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt.r2
> ? C:\Users\joe-swatosh\AppData\Local\Temp\wc-tmp\wc\dir\sample.txt.mine
>
> F
>
> Finished in 6.407 seconds.
>
> 1) Failure:
> test_resolve_base(SvnClientTest)
> C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_client.rb:2383:in
> `test_resolve_base'
> C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_client.rb:2376:in
> `assert_resolve'
> C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/test/util.rb:183:in
> `make_context'
> C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_client.rb:2348:in
> `assert_resolve'
> C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_client.rb:2381:in
> `test_resolve_base':
> Exception raised:
> Class: <Svn::Error::WcFoundConflict>
> Message: <"\nC:\\Users\\joe-swatosh\\Documents\\SVN\\src-trunk\\subversion\\libsvn_client\\commit_util.c:457:
> Svn::Error::WcFoundConflict: Aborting comm
> it: 'C:\\Users\\JOE-SW~1\\AppData\\Local\\Temp\\wc-tmp\\wc\\dir\\sample.txt'
> remains in conflict">
> ---Backtrace---
> ./svn/util.rb:86:in `svn_client_commit4'
> ./svn/util.rb:86:in `commit4'
> C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/svn/client.rb:166:in
> `ci'
> C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_client.rb:2384:in
> `test_resolve_base'
> C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_client.rb:2383:in
> `test_resolve_base'
> C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_client.rb:2376:in
> `assert_resolve'
> C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/test/util.rb:183:in
> `make_context'
> C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_client.rb:2348:in
> `assert_resolve'
> C:/Users/joe-swatosh/Documents/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_client.rb:2381:in
> `test_resolve_base'
> ---------------
>
> 1 tests, 3 assertions, 1 failures, 0 errors
>
>
>
> So it appears that svn_client_resolve isn't changing anything in the
> working copy anymore?
>
> I didn't try to read too much of subversion/libsvn_wc/adm_ops.c, I was
> hoping this would be fresh enough that you could figure it out.
>
> Thanks,
>
> --
> Joe
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2408531