motomike-bnr_tools 0.0.4 → 0.0.5

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 4
+:patch: 5
 :major: 0

data/bin/p4merge

@@ -0,0 +1,27 @@
+#!/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: motomike-bnr_tools
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Mike Ashmore
@@ -9,13 +9,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-26 00:00:00 -08:00
-default_executable: taggit
+date: 2009-02-27 00:00:00 -08:00
+default_executable: 
 dependencies: []
 
 description: Tools to help with tagging, for as long as we're stuck using SVN
 email: mashmore@digg.com
 executables: 
+- p4merge
 - taggit
 extensions: []
 
@@ -23,6 +24,7 @@ extra_rdoc_files: []
 
 files: 
 - VERSION.yml
+- bin/p4merge
 - bin/taggit
 - lib/bnr_tools
 - lib/bnr_tools/changeset.rb