Author: joeswatosh
Date: Wed Dec 9 06:53:22 2009
New Revision: 888713
URL: http://svn.apache.org/viewvc?rev=888713&view=rev
Log:
Follow on to r886924: "Fix issue #3180 'svn mergeinfo ignores peg rev for
WC target'." Update the expectations about mergeinfo.
* subversion/bindings/swig/ruby/test/test_client.rb
(SvnClientTest#assert_merge): Update mergeinfo expectations.
Modified:
subversion/trunk/subversion/bindings/swig/ruby/test/test_client.rb
Modified: subversion/trunk/subversion/bindings/swig/ruby/test/test_client.rb
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/test/test_client.rb?rev=888713&r1=888712&r2=888713&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/ruby/test/test_client.rb
(original)
+++ subversion/trunk/subversion/bindings/swig/ruby/test/test_client.rb Wed Dec
9 06:53:22 2009
@@ -1016,22 +1016,32 @@
end
assert_equal_log_entries([
[
- {branch_path_relative_uri => ["D", nil, -1]},
- rev4,
+ {branch_path_relative_uri => ["M", nil, -1]},
+ rev2,
{
"svn:author" => @author,
"svn:log" => log,
},
false,
]
- ] * 2, merged_entries)
+ ], merged_entries)
ctx.propdel("svn:mergeinfo", trunk)
merged_entries = []
ctx.log_merged(trunk, rev4, branch_uri, rev4) do |entry|
merged_entries << entry
end
- assert_equal_log_entries([], merged_entries)
+ assert_equal_log_entries([
+ [
+ {branch_path_relative_uri => ["M", nil, -1]},
+ rev2,
+ {
+ "svn:author" => @author,
+ "svn:log" => log,
+ },
+ false,
+ ]
+ ], merged_entries)
ctx.revert(trunk)
File.open(trunk_path, "a") {|f| f.print(src)}
