Contents

#!/usr/bin/env ruby
begin
  require 'rubygems'
  gem 'bnr_tools'
rescue LoadError
  $: << File.expand_path(File.dirname(__FILE__)) + "/../lib"
end

require 'bnr_tools'
require 'highline'

def resolveConflicts
  conflicts = `svn status #{ARGV[0] || Dir.pwd} | grep ^C | cut -c8-`.split("\n")
  conflicts.each { |conflict|
    conflict_working = "#{conflict}.working"
    conflict_merge_left = Dir.glob("#{conflict}.merge-left.r*").first
    conflict_merge_right = Dir.glob("#{conflict}.merge-right.r*").first
    `/Applications/p4merge.app/Contents/Resources/launchp4merge "#{conflict_working}" "#{conflict_merge_left}" "#{conflict_merge_right}" "#{conflict}"`
    if agree("Were you successful in resolving the conflict in \"#{conflict}\"? ")
      `svn resolved "#{conflict}"`
    else
      puts "failed to resolve #{conflict}. Run #{ARGV[0]} again to fix."
    end
  }
end

resolveConflicts

Version data entries

3 entries across 3 versions & 1 rubygems

Version	Path
motomike-bnr_tools-0.0.5	bin/p4merge
motomike-bnr_tools-0.0.6	bin/p4merge
motomike-bnr_tools-0.0.7	bin/p4merge