subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jcor...@apache.org
Subject svn commit: r1795871 - in /subversion/trunk/subversion/bindings/swig/ruby/test: test_core.rb test_fs.rb
Date Mon, 22 May 2017 23:37:31 GMT
Author: jcorvel
Date: Mon May 22 23:37:31 2017
New Revision: 1795871

URL: http://svn.apache.org/viewvc?rev=1795871&view=rev
Log:
Followup for r1795861 (revert of r1731699): revert r1764465 and r1764470,
ruby tests which were adapted to the changed behaviour after r1731699.

This should fix these ruby tests to work with the pre-r1731699 behaviour
again.

Modified:
    subversion/trunk/subversion/bindings/swig/ruby/test/test_core.rb
    subversion/trunk/subversion/bindings/swig/ruby/test/test_fs.rb

Modified: subversion/trunk/subversion/bindings/swig/ruby/test/test_core.rb
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/test/test_core.rb?rev=1795871&r1=1795870&r2=1795871&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/ruby/test/test_core.rb (original)
+++ subversion/trunk/subversion/bindings/swig/ruby/test/test_core.rb Mon May 22 23:37:31 2017
@@ -472,19 +472,9 @@ EOS
     latest.close
 
     expected = <<-EOD
-<<<<<<< #{modified.path}
-a
- b
-
-||||||| #{original.path}
-a
- b
-c
-=======
 
   b
-c
->>>>>>> #{latest.path}
+
 d
  e
 EOD

Modified: subversion/trunk/subversion/bindings/swig/ruby/test/test_fs.rb
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/test/test_fs.rb?rev=1795871&r1=1795870&r2=1795871&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/ruby/test/test_fs.rb (original)
+++ subversion/trunk/subversion/bindings/swig/ruby/test/test_fs.rb Mon May 22 23:37:31 2017
@@ -358,7 +358,7 @@ class SvnFsTest < Test::Unit::TestCase
     src = "a\nb\nc\nd\ne\n"
     modified = "A\nb\nc\nd\nE\n"
     result = "a\n\n\n\ne\n"
-    expected = "<<<<<<< .mine\nA\nb\nc\nd\n||||||| .r1\na\nb\nc\nd\n=======\na\n\n\n\n>>>>>>>
.r2\nE\n"
+    expected = "A\n\n\n\nE\n"
     path_in_repos = "/#{file}"
     path = File.join(@wc_path, file)
 
@@ -378,10 +378,6 @@ class SvnFsTest < Test::Unit::TestCase
       ctx.up(@wc_path)
       assert_equal(expected, File.open(path){|f| f.read})
 
-      ctx.resolve(:path=>@wc_path,
-                  :conflict_choice=>Svn::Wc::CONFLICT_CHOOSE_THEIRS_CONFLICT)
-      expected = "a\n\n\n\nE\n"
-
       rev2 = ctx.ci(@wc_path).revision
       if use_deprecated_api
         stream = @fs.root(rev2).file_delta_stream(@fs.root(rev1),



Mime
View raw message