~pythoneers/ubuntu/lucid/subversion/ltsppa

« back to all changes in this revision

Viewing changes to subversion/bindings/swig/ruby/test/test_client.rb

  • Committer: Max Bowsher
  • Date: 2009-11-17 03:07:29 UTC
  • mfrom: (0.3.4 sid)
  • Revision ID: maxb@f2s.com-20091117030729-l4vnv5evgeknvi8l
* Merge from debian unstable (LP: #483953), remaining changes:
  - Create pot file on build.
  - Build a python-subversion-dbg package.
  - (Build-)depend on default-jre-headless/-jdk.
  - Do not apply java-build patch.
  - Don't build for python2.4, not in main.
  - debian/rules: Manually create the doxygen output directory, otherwise
    we get weird build failures when running parallel builds.
  - Disable the serf backend because serf is in universe.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1013
1013
      yield(ctx, branch, rev3, rev4, trunk)
1014
1014
      ctx.revert(trunk, false)
1015
1015
      ctx.resolve(:path=>trunk_path,
1016
 
                  :conflict_choice=>Svn::Wc::CONFLICT_CHOOSE_MINE_FULL)
 
1016
                  :conflict_choice=>Svn::Wc::CONFLICT_CHOOSE_MERGED)
1017
1017
      rev5 = ctx.commit(@wc_path).revision
1018
1018
      assert(File.exist?(trunk_path))
1019
1019
      ctx.up(@wc_path)