motomike-bnr_tools 0.0.4 → 0.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION.yml +1 -1
- data/bin/p4merge +27 -0
- metadata +5 -3
data/VERSION.yml
CHANGED
data/bin/p4merge
ADDED
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
#!/usr/bin/env ruby
|
|
2
|
+
begin
|
|
3
|
+
require 'rubygems'
|
|
4
|
+
gem 'bnr_tools'
|
|
5
|
+
rescue LoadError
|
|
6
|
+
$: << File.expand_path(File.dirname(__FILE__)) + "/../lib"
|
|
7
|
+
end
|
|
8
|
+
|
|
9
|
+
require 'bnr_tools'
|
|
10
|
+
require 'highline'
|
|
11
|
+
|
|
12
|
+
def resolveConflicts
|
|
13
|
+
conflicts = `svn status #{ARGV[0] || Dir.pwd} | grep ^C | cut -c8-`.split("\n")
|
|
14
|
+
conflicts.each { |conflict|
|
|
15
|
+
conflict_working = "#{conflict}.working"
|
|
16
|
+
conflict_merge_left = Dir.glob("#{conflict}.merge-left.r*").first
|
|
17
|
+
conflict_merge_right = Dir.glob("#{conflict}.merge-right.r*").first
|
|
18
|
+
`/Applications/p4merge.app/Contents/Resources/launchp4merge "#{conflict_working}" "#{conflict_merge_left}" "#{conflict_merge_right}" "#{conflict}"`
|
|
19
|
+
if agree("Were you successful in resolving the conflict in \"#{conflict}\"? ")
|
|
20
|
+
`svn resolved "#{conflict}"`
|
|
21
|
+
else
|
|
22
|
+
puts "failed to resolve #{conflict}. Run #{ARGV[0]} again to fix."
|
|
23
|
+
end
|
|
24
|
+
}
|
|
25
|
+
end
|
|
26
|
+
|
|
27
|
+
resolveConflicts
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: motomike-bnr_tools
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Mike Ashmore
|
|
@@ -9,13 +9,14 @@ autorequire:
|
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
11
|
|
|
12
|
-
date: 2009-02-
|
|
13
|
-
default_executable:
|
|
12
|
+
date: 2009-02-27 00:00:00 -08:00
|
|
13
|
+
default_executable:
|
|
14
14
|
dependencies: []
|
|
15
15
|
|
|
16
16
|
description: Tools to help with tagging, for as long as we're stuck using SVN
|
|
17
17
|
email: mashmore@digg.com
|
|
18
18
|
executables:
|
|
19
|
+
- p4merge
|
|
19
20
|
- taggit
|
|
20
21
|
extensions: []
|
|
21
22
|
|
|
@@ -23,6 +24,7 @@ extra_rdoc_files: []
|
|
|
23
24
|
|
|
24
25
|
files:
|
|
25
26
|
- VERSION.yml
|
|
27
|
+
- bin/p4merge
|
|
26
28
|
- bin/taggit
|
|
27
29
|
- lib/bnr_tools
|
|
28
30
|
- lib/bnr_tools/changeset.rb
|