← Back to branch summary

~svn/ubuntu/oneiric/subversion/ppa

« back to all changes in this revision

Viewing changes to debian/patches/ruby-test-tree-conflicts

  • Committer: Max Bowsher
  • Date: 2009-11-17 02:32:08 UTC
  • mfrom: (0.3.3 sid)
  • Revision ID: maxb@f2s.com-20091117023208-j2aw4tkg14zh062t
Merge ancestry and replace file-ids from Debian 1.6.5dfsg-1, no change to content.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ruby-test-tree-conflicts
1
 
Fix two ruby tests, from upstream trunk r38886.  Will be in 1.6.6 and 1.7.
2
 
 
3
 
--- a/subversion/bindings/swig/ruby/test/test_client.rb
4
 
+++ b/subversion/bindings/swig/ruby/test/test_client.rb
5
 
@@ -1013,7 +1013,7 @@
6
 
       yield(ctx, branch, rev3, rev4, trunk)
7
 
       ctx.revert(trunk, false)
8
 
       ctx.resolve(:path=>trunk_path,
9
 
-                  :conflict_choice=>Svn::Wc::CONFLICT_CHOOSE_MINE_FULL)
10
 
+                  :conflict_choice=>Svn::Wc::CONFLICT_CHOOSE_MERGED)
11
 
       rev5 = ctx.commit(@wc_path).revision
12
 
       assert(File.exist?(trunk_path))
13
 
       ctx.up(@wc_path)