Author: stsp
Date: Wed Oct 12 13:52:16 2016
New Revision: 1764470
URL: http://svn.apache.org/viewvc?rev=1764470&view=rev
Log:
* subversion/bindings/swig/ruby/test/test_fs.rb
(test_delta): Expect and resolve text conflict to account for new behaviour
with flagging text conflicts since r1731699.
Modified:
subversion/trunk/subversion/bindings/swig/ruby/test/test_fs.rb
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=1764470&r1=1764469&r2=1764470&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/ruby/test/test_fs.rb (original)
+++ subversion/trunk/subversion/bindings/swig/ruby/test/test_fs.rb Wed Oct 12
13:52:16 2016
@@ -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 = "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"
path_in_repos = "/#{file}"
path = File.join(@wc_path, file)
@@ -378,6 +378,10 @@ 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),
