Re: svn commit: r959954 - /subversion/trunk/subversion/libsvn_wc/wc.h

On Sun, Aug 1, 2010 at 3:17 PM, Bert Huijben <bert_at_qqmail.nl> wrote:
>
>

>> >
>> > The Ruby tests trigger this error when they try to delete some
>> mergeinfo,
>> > but this error is a few levels deep in some lambda processing so I
>> find it
>> > hard to find out what the expected status should be here.
>> >
>>

>
> I think r981319 is the proper fix for this issue.
>
>        Bert
>

Thanks Bert, now passing for me locally.

I was going to propose either

<>
Index: subversion/bindings/swig/ruby/test/test_client.rb
===================================================================
--- subversion/bindings/swig/ruby/test/test_client.rb (revision 980794)
+++ subversion/bindings/swig/ruby/test/test_client.rb (working copy)
@@ -1026,7 +1026,7 @@
                                 ]
                                ], merged_entries)

- ctx.propdel("svn:mergeinfo", trunk)
+ ctx.propdel("svn:mergeinfo", trunk, :empty)
       merged_entries = []
       ctx.log_merged(trunk, rev4, branch_uri, rev4) do |entry|
         merged_entries << entry
@@ -1056,7 +1056,7 @@
       yield(ctx, branch, rev3, rev4, trunk, nil, false, true)
       assert_changed(ctx, trunk)

- ctx.propdel("svn:mergeinfo", trunk)
+ ctx.propdel("svn:mergeinfo", trunk, :empty)
       rev6 = ctx.commit(@wc_path).revision

       yield(ctx, branch, rev3, rev4, trunk, nil, false, true, true)
</>

Which just causes the propdel to not recurse in the merge tests or

<>
Index: subversion/bindings/swig/ruby/test/test_client.rb
===================================================================
--- subversion/bindings/swig/ruby/test/test_client.rb (revision 980794)
+++ subversion/bindings/swig/ruby/test/test_client.rb (working copy)
@@ -1372,7 +1372,7 @@
       assert_equal({}, ctx.pg(prop_name, path))

       ctx.up(@wc_path)
- ctx.ps(prop_name, prop_value, dir_path)
+ ctx.ps(prop_name, prop_value, dir_path, true)
       ctx.ci(@wc_path)
       assert_equal({
                      dir_uri => prop_value,
@@ -1381,17 +1381,17 @@
                    ctx.pg(prop_name, dir_path))

       ctx.up(@wc_path)
- ctx.pdel(prop_name, dir_path, false)
+ ctx.pdel(prop_name, dir_path)
       ctx.ci(@wc_path)
       assert_equal({uri => prop_value}, ctx.pg(prop_name, dir_path))

       ctx.up(@wc_path)
- ctx.pd(prop_name, dir_path)
+ ctx.pd(prop_name, dir_path, :infinity)
       ctx.ci(@wc_path)
       assert_equal({}, ctx.pg(prop_name, dir_path))

       ctx.up(@wc_path)
- ctx.ps(prop_name, prop_value, dir_path, false)
+ ctx.ps(prop_name, prop_value, dir_path)
       ctx.ci(@wc_path)
       assert_equal({dir_uri => prop_value}, ctx.pg(prop_name, dir_path))

@@ -1444,7 +1444,7 @@
       assert_equal([value1], ctx.pl(path).collect{|item| item[name1]})

       ctx.up(@wc_path)
- ctx.ps(name2, value2, dir_path)
+ ctx.ps(name2, value2, dir_path, :infinity)
       ctx.ci(@wc_path)
       assert_equal([uri, dir_uri].sort,
                    ctx.prop_list(dir_path).collect{|item| item.name})
Index: subversion/bindings/swig/ruby/svn/client.rb
===================================================================
--- subversion/bindings/swig/ruby/svn/client.rb (revision 980794)
+++ subversion/bindings/swig/ruby/svn/client.rb (working copy)
@@ -264,7 +264,7 @@
         Client.resolve(arguments[:path], arguments[:depth],
arguments[:conflict_choice], self)
       end

- def propset(name, value, target, depth_or_recurse=nil, force=false,
+ def propset(name, value, target, depth_or_recurse=:empty, force=false,
                   base_revision_for_url=nil, changelists_names=nil,
                   revprop_table=nil)
         base_revision_for_url ||= Svn::Core::INVALID_REVNUM
</>

Which changes the default depth for propset (used in the
implementation of propdel) from infinity to empty and adjusts the
property tests.

This seems like what the default should have been, but I don't like
changing the default. Now that you've solved it, I'm not sure it
matters, but I'm curious what others opinions are.

--
Joe