Index: subversion/bindings/swig/ruby/test/test_client.rb =================================================================== --- subversion/bindings/swig/ruby/test/test_client.rb (revision 24064) +++ subversion/bindings/swig/ruby/test/test_client.rb (working copy) @@ -848,6 +848,7 @@ ctx.merge(branch, rev3, branch, rev4, trunk) assert(!File.exist?(trunk_path)) + ctx.propdel("svn:mergeinfo", trunk) ctx.revert(trunk_path) File.open(trunk_path, "a") {|f| f.print(src)} ctx.merge(branch, rev3, branch, rev4, trunk) @@ -895,6 +896,7 @@ ctx.merge_peg(branch, rev3, rev4, trunk) assert(!File.exist?(trunk_path)) + ctx.propdel("svn:mergeinfo", trunk) ctx.revert(trunk_path) File.open(trunk_path, "a") {|f| f.print(src)} ctx.merge_peg(branch, rev3, rev4, trunk)